Revision: 1598 http://svn.sourceforge.net/geany/?rev=1598&view=rev Author: eht16 Date: 2007-06-04 08:37:11 -0700 (Mon, 04 Jun 2007)
Log Message: ----------- Removed unneeded function destroyapp. Re-maximize the main window on startup when closed in maximized state (closes #1730369).
Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/keyfile.c trunk/src/main.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-06-04 14:58:12 UTC (rev 1597) +++ trunk/ChangeLog 2007-06-04 15:37:11 UTC (rev 1598) @@ -2,6 +2,11 @@
* po/POTFILES.in: Add navqueue.c. * po/intl_stats.sh: Add revision time to the output. + * src/callbacks.c, src/callbacks.h: + Removed unneeded function destroyapp. + * src/keyfile.c, src/main.c: + Re-maximize the main window on startup when closed in maximized state + (closes #1730369).
2007-06-04 Enrico Tröger enrico.troeger@uvena.de
Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2007-06-04 14:58:12 UTC (rev 1597) +++ trunk/src/callbacks.c 2007-06-04 15:37:11 UTC (rev 1598) @@ -87,14 +87,6 @@ CallbacksData callbacks_data = {-1};
-// real exit function -gint destroyapp(GtkWidget *widget, gpointer gdata) -{ - main_quit(); - return (FALSE); -} - - static gboolean check_no_unsaved() { guint i; @@ -157,7 +149,7 @@ } on_close_all1_activate(NULL, NULL);
- destroyapp(NULL, NULL); + main_quit(); }
Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2007-06-04 14:58:12 UTC (rev 1597) +++ trunk/src/callbacks.h 2007-06-04 15:37:11 UTC (rev 1598) @@ -29,9 +29,6 @@ extern CallbacksData callbacks_data;
-gint -destroyapp (GtkWidget *widget, gpointer gdata); - gboolean on_exit_clicked (GtkWidget *widget, gpointer gdata);
Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2007-06-04 14:58:12 UTC (rev 1597) +++ trunk/src/keyfile.c 2007-06-04 15:37:11 UTC (rev 1598) @@ -237,7 +237,14 @@ 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]); + if (gdk_window_get_state(app->window->window) & GDK_WINDOW_STATE_MAXIMIZED) + { // use -1 for width and height if the window is maximized + app->geometry[2] = -1; + app->geometry[3] = -1; + } + else + gtk_window_get_size(GTK_WINDOW(app->window), &app->geometry[2], &app->geometry[3]); + g_key_file_set_integer_list(config, PACKAGE, "geometry", app->geometry, 4); } g_key_file_set_integer(config, PACKAGE, "pref_editor_tab_width", editor_prefs.tab_width);
Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2007-06-04 14:58:12 UTC (rev 1597) +++ trunk/src/main.c 2007-06-04 15:37:11 UTC (rev 1598) @@ -205,7 +205,11 @@ if (app->pref_main_save_winpos && app->geometry[0] != -1) { gtk_window_move(GTK_WINDOW(app->window), app->geometry[0], app->geometry[1]); - gtk_window_set_default_size(GTK_WINDOW(app->window), app->geometry[2], app->geometry[3]); + if (app->geometry[2] == -1 && app->geometry[3] == -1) + gtk_window_maximize(GTK_WINDOW(app->window)); + else + gtk_window_set_default_size(GTK_WINDOW(app->window), app->geometry[2], app->geometry[3]); + }
// hide statusbar if desired
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.