Changeset 8673

Timestamp:

Jun 11, 2009, 10:36:45 PM (13 years ago)

Author:

charles

Message:

(trunk gtk) #2201: transmission doesn't remember maximized state

Location:

trunk/gtk

Files:

• conf.c (modified) (1 diff)
• main.c (modified) (2 diffs)
• tr-prefs.h (modified) (1 diff)
• tr-window.c (modified) (1 diff)

trunk/gtk/conf.c

@@ -181 +181 @@
     tr_bencDictAddBool( d, PREF_KEY_OPTIONS_PROMPT, TRUE );
 
+    tr_bencDictAddBool( d, PREF_KEY_MAIN_WINDOW_IS_MAXIMIZED, FALSE );
     tr_bencDictAddInt( d, PREF_KEY_MAIN_WINDOW_HEIGHT, 500 );
     tr_bencDictAddInt( d, PREF_KEY_MAIN_WINDOW_WIDTH, 300 );

trunk/gtk/main.c

@@ -248 +248 @@
                                  & GDK_WINDOW_STATE_MAXIMIZED );
 
+    pref_int_set( PREF_KEY_MAIN_WINDOW_IS_MAXIMIZED, isMaximized );
+
     if( !isMaximized )
     {
@@ -711 +713 @@
     /* clear the UI */
     gtk_list_store_clear( GTK_LIST_STORE( tr_core_model( cbdata->core ) ) );
+
+    /* ensure the window is in its previous position & size.
+     * this seems to be necessary because changing the main window's
+     * child seems to unset the size */
+    gtk_window_resize( cbdata->wind, pref_int_get( PREF_KEY_MAIN_WINDOW_WIDTH ),
+                                     pref_int_get( PREF_KEY_MAIN_WINDOW_HEIGHT ) );
+    gtk_window_move( cbdata->wind, pref_int_get( PREF_KEY_MAIN_WINDOW_X ),
+                                   pref_int_get( PREF_KEY_MAIN_WINDOW_Y ) );
 
     /* shut down libT */

trunk/gtk/tr-prefs.h

@@ -46 +46 @@
 #define PREF_KEY_MAIN_WINDOW_X              "main-window-x"
 #define PREF_KEY_MAIN_WINDOW_Y              "main-window-y"
+#define PREF_KEY_MAIN_WINDOW_IS_MAXIMIZED   "main-window-is-maximized"
 
 #endif

trunk/gtk/tr-window.c

@@ -833 +833 @@
                                  pref_int_get( PREF_KEY_MAIN_WINDOW_HEIGHT ) );
     gtk_window_move( win, pref_int_get( PREF_KEY_MAIN_WINDOW_X ),
-                     pref_int_get( PREF_KEY_MAIN_WINDOW_Y ) );
+                          pref_int_get( PREF_KEY_MAIN_WINDOW_Y ) );
+    if( pref_flag_get( PREF_KEY_MAIN_WINDOW_IS_MAXIMIZED ) )
+        gtk_window_maximize( win );
     gtk_window_add_accel_group( win, gtk_ui_manager_get_accel_group( ui_mgr ) );