sharpetronics/geany
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed unneeded function destroyapp.

Browse Source 
Re-maximize the main window on startup when closed in maximized state (closes #1730369).	  


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@1598 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2007-06-04 15:37:11 +00:00
parent b766e9c4d8
commit 38d45d2549
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -2,6 +2,11 @@
* po/POTFILES.in: Add navqueue.c. * po/POTFILES.in: Add navqueue.c.
* po/intl_stats.sh: Add revision time to the output. * 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> 2007-06-04 Enrico Tröger <enrico.troeger@uvena.de>

10
src/callbacks.c
View File

@ -87,14 +87,6 @@ static gboolean insert_callback_from_menu = FALSE;
CallbacksData callbacks_data = {-1}; CallbacksData callbacks_data = {-1};
// real exit function
gint destroyapp(GtkWidget *widget, gpointer gdata)
{
main_quit();
return (FALSE);
}
static gboolean check_no_unsaved() static gboolean check_no_unsaved()
{ {
guint i; guint i;
@ -157,7 +149,7 @@ static void quit_app()
} }
on_close_all1_activate(NULL, NULL); on_close_all1_activate(NULL, NULL);
destroyapp(NULL, NULL); main_quit();
} }

3
src/callbacks.h
View File

@ -29,9 +29,6 @@ typedef struct
extern CallbacksData callbacks_data; extern CallbacksData callbacks_data;
gint
destroyapp (GtkWidget *widget, gpointer gdata);
gboolean gboolean
on_exit_clicked (GtkWidget *widget, gpointer gdata); on_exit_clicked (GtkWidget *widget, gpointer gdata);

9
src/keyfile.c
View File

@ -237,7 +237,14 @@ void configuration_save()
if (app->pref_main_save_winpos && ! app->fullscreen) 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_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_list(config, PACKAGE, "geometry", app->geometry, 4);
} }
g_key_file_set_integer(config, PACKAGE, "pref_editor_tab_width", editor_prefs.tab_width); g_key_file_set_integer(config, PACKAGE, "pref_editor_tab_width", editor_prefs.tab_width);

6
src/main.c
View File

@ -205,7 +205,11 @@ static void apply_settings(void)
if (app->pref_main_save_winpos && app->geometry[0] != -1) 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_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 // hide statusbar if desired