SF.net SVN: geany: [542] trunk

[ntrel at users.sourceforge.net]

Revision: 542
Author:   ntrel
Date:     2006-07-08 10:37:41 -0700 (Sat, 08 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/geany/?rev=542&view=rev

Log Message:
-----------
Improve switching out of fullscreen after startup

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/keyfile.c
    trunk/src/main.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-07-08 16:59:08 UTC (rev 541)
+++ trunk/ChangeLog	2006-07-08 17:37:41 UTC (rev 542)
@@ -1,6 +1,8 @@
 2006-07-08  Nick Treleaven  <nick.treleaven at btinternet.com>
 
  * src/keyfile.c: Fix saving the terminal tool on quitting.
+ * src/keyfile.c, src/main.c:
+   Improve switching out of fullscreen after startup.
 
 
 2006-07-08  Enrico Tröger  <enrico.troeger at uvena.de>

Modified: trunk/src/keyfile.c
===================================================================
--- trunk/src/keyfile.c	2006-07-08 16:59:08 UTC (rev 541)
+++ trunk/src/keyfile.c	2006-07-08 17:37:41 UTC (rev 542)
@@ -114,7 +114,7 @@
 	g_key_file_set_string(config, PACKAGE, "tagbar_font", app->tagbar_font);
 	g_key_file_set_string(config, PACKAGE, "msgwin_font", app->msgwin_font);
 	g_key_file_set_string(config, PACKAGE, "scribble_text", scribble_text);
-	if (app->pref_main_save_winpos)
+	if (app->pref_main_save_winpos && ! app->fullscreen)
 	{
 		gtk_window_get_position(GTK_WINDOW(app->window), &app->geometry[0], &app->geometry[1]);
 		gtk_window_get_size(GTK_WINDOW(app->window), &app->geometry[2], &app->geometry[3]);
@@ -455,6 +455,15 @@
 			tabnum++;
 		}
 	}
+
+	// set fullscreen after initial draw so that returning to normal view is the right size.
+	// fullscreen mode is disabled by default, so act only if it is true
+	if (app->fullscreen)
+	{
+		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(lookup_widget(app->window, "menu_fullscreen1")), TRUE);
+		app->fullscreen = TRUE;
+		utils_set_fullscreen();
+	}
 }
 
 

Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c	2006-07-08 16:59:08 UTC (rev 541)
+++ trunk/src/main.c	2006-07-08 17:37:41 UTC (rev 542)
@@ -157,13 +157,6 @@
 	}
 	utils_update_toolbar_icons(app->toolbar_icon_size);
 
-	// fullscreen mode is disabled by default, so act only if it is true
-	if (app->fullscreen)
-	{
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(lookup_widget(app->window, "menu_fullscreen1")), TRUE);
-		app->fullscreen = TRUE;
-		utils_set_fullscreen();
-	}
 	// line number and markers margin are by default enabled
 	if (! app->show_markers_margin)
 	{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.