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

Improve switching out of fullscreen after startup

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@542 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2006-07-08 17:37:41 +00:00
parent 701929eb2d
commit 82efaa626f
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,6 +1,8 @@
2006-07-08 Nick Treleaven <nick.treleaven@btinternet.com> 2006-07-08 Nick Treleaven <nick.treleaven@btinternet.com>
* src/keyfile.c: Fix saving the terminal tool on quitting. * 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@uvena.de> 2006-07-08 Enrico Tröger <enrico.troeger@uvena.de>

11
src/keyfile.c
View File

@ -114,7 +114,7 @@ void configuration_save(void)
g_key_file_set_string(config, PACKAGE, "tagbar_font", app->tagbar_font); 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, "msgwin_font", app->msgwin_font);
g_key_file_set_string(config, PACKAGE, "scribble_text", scribble_text); 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_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]); gtk_window_get_size(GTK_WINDOW(app->window), &app->geometry[2], &app->geometry[3]);
@ -455,6 +455,15 @@ void configuration_apply_settings(void)
tabnum++; 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();
}
} }

7
src/main.c
View File

@ -157,13 +157,6 @@ static void apply_settings(void)
} }
utils_update_toolbar_icons(app->toolbar_icon_size); 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 // line number and markers margin are by default enabled
if (! app->show_markers_margin) if (! app->show_markers_margin)
{ {