From 416cdb8bbe331d1e945eacdd842f44d5e1d5f6ac Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Mon, 6 Aug 2012 17:22:32 +0200 Subject: also save window state (maximization, iconification, etc) in config file it is saved as an integer (bitmap) instead of introducing keys for all flags --- src/main.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index 5d7324f..a9c244a 100644 --- a/src/main.c +++ b/src/main.c @@ -390,6 +390,40 @@ window_get_geometry(GtkWindow *window) return geometry; } +void +window_set_state(GtkWindow *window, GdkWindowState state) +{ + /* the GDK_WINDOW_STATE_WITHDRAWN flag is ignored */ + + if (state & GDK_WINDOW_STATE_ICONIFIED) + gtk_window_iconify(window); + else + gtk_window_deiconify(window); + + if (state & GDK_WINDOW_STATE_MAXIMIZED) + gtk_window_maximize(window); + else + gtk_window_unmaximize(window); + + if (state & GDK_WINDOW_STATE_STICKY) + gtk_window_stick(window); + else + gtk_window_unstick(window); + + if (state & GDK_WINDOW_STATE_FULLSCREEN) + gtk_window_fullscreen(window); + else + gtk_window_unfullscreen(window); + + if (state & GDK_WINDOW_STATE_ICONIFIED) + gtk_window_iconify(window); + else + gtk_window_deiconify(window); + + gtk_window_set_keep_above(window, state & GDK_WINDOW_STATE_ABOVE); + gtk_window_set_keep_below(window, state & GDK_WINDOW_STATE_BELOW); +} + /** @private */ int main(int argc, char *argv[]) @@ -554,11 +588,17 @@ main(int argc, char *argv[]) geometry); g_free(geometry); + window_set_state(GTK_WINDOW(player_window), + config_get_window_state("Player")); + geometry = config_get_window_geometry("Info"); if (geometry != NULL) gtk_window_parse_geometry(GTK_WINDOW(info_window), geometry); g_free(geometry); + + window_set_state(GTK_WINDOW(info_window), + config_get_window_state("Info")); } gtk_widget_show(player_window); @@ -572,13 +612,20 @@ main(int argc, char *argv[]) * update config file */ if (config_get_save_window_properties()) { - const gchar *geometry; + const gchar *geometry; + GdkWindowState state; geometry = window_get_geometry(GTK_WINDOW(player_window)); config_set_window_geometry("Player", geometry); + state = gdk_window_get_state(gtk_widget_get_window(player_window)); + config_set_window_state("Player", state); + geometry = window_get_geometry(GTK_WINDOW(info_window)); config_set_window_geometry("Info", geometry); + + state = gdk_window_get_state(gtk_widget_get_window(info_window)); + config_set_window_state("Info", state); } modified_style = gtk_widget_get_modifier_style(transcript_wizard_widget); -- cgit v1.2.3