Revision: 1599 http://svn.sourceforge.net/geany/?rev=1599&view=rev Author: eht16 Date: 2007-06-04 09:12:58 -0700 (Mon, 04 Jun 2007)
Log Message: ----------- Improved code to avoid hiding the messages window (caused by last commit).
Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/geany.h trunk/src/keyfile.c trunk/src/main.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-06-04 15:37:11 UTC (rev 1598) +++ trunk/ChangeLog 2007-06-04 16:12:58 UTC (rev 1599) @@ -3,10 +3,13 @@ * 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. + Remove unneeded functions destroyapp and on_window_configure_event. * src/keyfile.c, src/main.c: Re-maximize the main window on startup when closed in maximized state (closes #1730369). + * src/geany.h, src/keyfile.c, src/main.c: + Improved code to avoid hiding the messages window + (caused by last commit).
2007-06-04 Enrico Tröger enrico.troeger@uvena.de
Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2007-06-04 15:37:11 UTC (rev 1598) +++ trunk/src/callbacks.c 2007-06-04 16:12:58 UTC (rev 1599) @@ -946,20 +946,6 @@
gboolean -on_window_configure_event (GtkWidget *widget, - GdkEventConfigure *event, - gpointer user_data) -{ - app->geometry[0] = event->x; - app->geometry[1] = event->y; - app->geometry[2] = event->width; - app->geometry[3] = event->height; - - return FALSE; -} - - -gboolean on_window_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data)
Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2007-06-04 15:37:11 UTC (rev 1598) +++ trunk/src/callbacks.h 2007-06-04 16:12:58 UTC (rev 1599) @@ -237,11 +237,6 @@ on_fullscreen1_activate (GtkMenuItem *menuitem, gpointer user_data);
-gboolean -on_window_configure_event (GtkWidget *widget, - GdkEventConfigure *event, - gpointer user_data); - void on_show_toolbar1_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data);
Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2007-06-04 15:37:11 UTC (rev 1598) +++ trunk/src/geany.h 2007-06-04 16:12:58 UTC (rev 1599) @@ -78,8 +78,8 @@ typedef struct MyApp { gint toolbar_icon_style; - // 0:x, 1:y, 2:width, 3:height - gint geometry[4]; + // 0:x, 1:y, 2:width, 3:height, flag for maximized state + gint geometry[5]; gboolean debug_mode; // represents the state at startup while opening session files gboolean opening_session_files;
Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2007-06-04 15:37:11 UTC (rev 1598) +++ trunk/src/keyfile.c 2007-06-04 16:12:58 UTC (rev 1599) @@ -237,15 +237,13 @@ 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; - } + app->geometry[4] = 1; else - gtk_window_get_size(GTK_WINDOW(app->window), &app->geometry[2], &app->geometry[3]); + app->geometry[4] = 0;
- g_key_file_set_integer_list(config, PACKAGE, "geometry", app->geometry, 4); + g_key_file_set_integer_list(config, PACKAGE, "geometry", app->geometry, 5); } g_key_file_set_integer(config, PACKAGE, "pref_editor_tab_width", editor_prefs.tab_width); g_key_file_set_boolean(config, PACKAGE, "pref_editor_use_tabs", editor_prefs.use_tabs); @@ -351,7 +349,6 @@
gboolean configuration_load() { - guint geo_len; gint *geo; gchar *configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "geany.conf", NULL); gchar *tmp_string, *tmp_string2; @@ -421,7 +418,7 @@ scribble_text = utils_get_setting_string(config, PACKAGE, "scribble_text", _("Type here what you want, use it as a notice/scratch board"));
- geo = g_key_file_get_integer_list(config, PACKAGE, "geometry", &geo_len, &error); + geo = g_key_file_get_integer_list(config, PACKAGE, "geometry", NULL, &error); if (error) { app->geometry[0] = -1; @@ -434,6 +431,7 @@ app->geometry[1] = geo[1]; app->geometry[2] = geo[2]; app->geometry[3] = geo[3]; + app->geometry[4] = geo[4]; } hpan_position = utils_get_setting_integer(config, PACKAGE, "treeview_position", 156); vpan_position = utils_get_setting_integer(config, PACKAGE, "msgwindow_position", (geo) ?
Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2007-06-04 15:37:11 UTC (rev 1598) +++ trunk/src/main.c 2007-06-04 16:12:58 UTC (rev 1599) @@ -205,11 +205,9 @@ if (app->pref_main_save_winpos && app->geometry[0] != -1) { gtk_window_move(GTK_WINDOW(app->window), app->geometry[0], app->geometry[1]); - if (app->geometry[2] == -1 && app->geometry[3] == -1) + gtk_window_set_default_size(GTK_WINDOW(app->window), app->geometry[2], app->geometry[3]); + if (app->geometry[4] == 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 @@ -679,7 +677,6 @@
// registering some basic events g_signal_connect(G_OBJECT(app->window), "delete_event", G_CALLBACK(on_exit_clicked), NULL); - g_signal_connect(G_OBJECT(app->window), "configure-event", G_CALLBACK(on_window_configure_event), NULL); g_signal_connect(G_OBJECT(app->window), "key-press-event", G_CALLBACK(on_window_key_press_event), NULL); g_signal_connect(G_OBJECT(app->toolbar), "button-press-event", G_CALLBACK(toolbar_popup_menu), NULL);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.