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

Fix offscreen window after quitting when minimized

Browse Source 
Fixes #3421282.
Occurred with Windows e.g. Vista, 7.
This commit is contained in:
Nick Treleaven 2011-12-08 16:31:21 +00:00
parent 3baaa53679
commit d7f53f7f83
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/keyfile.c
View File

@ -546,6 +546,8 @@ static void save_ui_prefs(GKeyFile *config)
if (prefs.save_winpos)
{
GdkWindowState wstate;
g_key_file_set_integer(config, PACKAGE, "treeview_position",
gtk_paned_get_position(GTK_PANED(ui_lookup_widget(main_widgets.window, "hpaned1"))));
g_key_file_set_integer(config, PACKAGE, "msgwindow_position",
@ -553,11 +555,8 @@ static void save_ui_prefs(GKeyFile *config)
gtk_window_get_position(GTK_WINDOW(main_widgets.window), &ui_prefs.geometry[0], &ui_prefs.geometry[1]);
gtk_window_get_size(GTK_WINDOW(main_widgets.window), &ui_prefs.geometry[2], &ui_prefs.geometry[3]);
if (gdk_window_get_state(gtk_widget_get_window(main_widgets.window)) & GDK_WINDOW_STATE_MAXIMIZED)
ui_prefs.geometry[4] = 1;
else
ui_prefs.geometry[4] = 0;
wstate = gdk_window_get_state(gtk_widget_get_window(main_widgets.window));
ui_prefs.geometry[4] = (wstate & GDK_WINDOW_STATE_MAXIMIZED) ? 1 : 0;
g_key_file_set_integer_list(config, PACKAGE, "geometry", ui_prefs.geometry, 5);
}
@ -938,13 +937,11 @@ static void load_ui_prefs(GKeyFile *config)
/* don't use insane values but when main windows was maximized last time, pos might be
* negative (due to differences in root window and window decorations) */
if (ui_prefs.geometry[4] != 1)
/* quitting when minimized can make pos -32000, -32000 on Windows! */
for (i = 0; i < 4; i++)
{
for (i = 2; i < 4; i++)
{
if (ui_prefs.geometry[i] < -1)
ui_prefs.geometry[i] = -1;
}
if (ui_prefs.geometry[i] < -1)
ui_prefs.geometry[i] = -1;
}
}
hpan_position = utils_get_setting_integer(config, PACKAGE, "treeview_position", 156);

20
src/main.c
View File

@ -156,13 +156,19 @@ static GOptionEntry entries[] =
static void setup_window_position(void)
{
/* interprets the saved window geometry */
if (prefs.save_winpos && ui_prefs.geometry[0] != -1)
{
gtk_window_move(GTK_WINDOW(main_widgets.window), ui_prefs.geometry[0], ui_prefs.geometry[1]);
gtk_window_set_default_size(GTK_WINDOW(main_widgets.window), ui_prefs.geometry[2], ui_prefs.geometry[3]);
if (ui_prefs.geometry[4] == 1)
gtk_window_maximize(GTK_WINDOW(main_widgets.window));
}
if (!prefs.save_winpos)
return;
if (ui_prefs.geometry[0] != -1 && ui_prefs.geometry[1] != -1)
gtk_window_move(GTK_WINDOW(main_widgets.window),
ui_prefs.geometry[0], ui_prefs.geometry[1]);
if (ui_prefs.geometry[2] != -1 && ui_prefs.geometry[3] != -1)
gtk_window_set_default_size(GTK_WINDOW(main_widgets.window),
ui_prefs.geometry[2], ui_prefs.geometry[3]);
if (ui_prefs.geometry[4] == 1)
gtk_window_maximize(GTK_WINDOW(main_widgets.window));
}