Ticket #399: final-window-sizes-position.patch

gtk/util.c

@@ -284 +284 @@
     gtk_scrolled_window_set_policy( scroll, GTK_POLICY_NEVER,
                                             GTK_POLICY_NEVER );
 
+    /* restore window sizes and position */
+    gint mainWindowHeight;
+    gint mainWindowWidth;
+    
+    gint mainWindowX;
+    gint mainWindowY;
+
+    mainWindowHeight = pref_int_get( PREF_KEY_MAIN_WINDOW_HEIGHT );
+    mainWindowWidth = pref_int_get( PREF_KEY_MAIN_WINDOW_WIDTH );
+
+    mainWindowX = pref_int_get( PREF_KEY_MAIN_WINDOW_X );
+    mainWindowY = pref_int_get( PREF_KEY_MAIN_WINDOW_Y );
+
     gtk_widget_size_request( GTK_WIDGET( wind ), &req );
     req.height = MAX( req.height, 300 );
     height = MIN( req.height, gdk_screen_get_height( screen ) / 5 * 4 );
@@ -293 +306 @@
     req.width = MAX( req.width, 500 );
     width = MIN( req.width, gdk_screen_get_width( screen ) / 2 );
 
-    gtk_window_set_default_size( wind, width, height );
+    gtk_window_set_default_size( wind, mainWindowHeight, mainWindowWidth );
+    gtk_window_move( wind, mainWindowX, mainWindowY );
     gtk_scrolled_window_set_policy( scroll, hscroll, vscroll );
 }
 

gtk/tr-prefs.c

@@ -85 +85 @@
     pref_flag_set_default   ( PREF_KEY_START, TRUE );
     pref_flag_set_default   ( PREF_KEY_TRASH_ORIGINAL, FALSE );
 
+    pref_string_set_default ( PREF_KEY_MAIN_WINDOW_HEIGHT, "300" );
+    pref_string_set_default ( PREF_KEY_MAIN_WINDOW_WIDTH, "500" );
+
+    pref_string_set_default ( PREF_KEY_MAIN_WINDOW_X, "0" );
+    pref_string_set_default ( PREF_KEY_MAIN_WINDOW_Y, "0" );
+
     pref_save( NULL );
 }
 

gtk/tr-prefs.h

@@ -49 +49 @@
 #define PREF_KEY_MAX_PEERS_GLOBAL       "max-peers-global"
 #define PREF_KEY_MAX_PEERS_PER_TORRENT  "max-peers-per-torrent"
 #define PREF_KEY_BLOCKLIST_ENABLED      "blocklist-enabled"
+#define PREF_KEY_MAIN_WINDOW_HEIGHT     "main-window-height"
+#define PREF_KEY_MAIN_WINDOW_WIDTH      "main-window-width"
+#define PREF_KEY_MAIN_WINDOW_X          "main-window-x"
+#define PREF_KEY_MAIN_WINDOW_Y          "main-window-y"
 
-
 void tr_prefs_init_global( void );
 
 #endif

gtk/main.c

@@ -656 +656 @@
 
     gtk_widget_show_all(r);
 
+    /* get and save window sizes and position */
+    gint mainWindowHeight;
+    gint mainWindowWidth;
+    gint mainWindowX;
+    gint mainWindowY;
+
+    gtk_window_get_size( GTK_WINDOW( c ), &mainWindowHeight, &mainWindowWidth );
+    gtk_window_get_position( GTK_WINDOW( c ), &mainWindowX, &mainWindowY );
+
+    pref_int_set( PREF_KEY_MAIN_WINDOW_HEIGHT, mainWindowHeight );
+    pref_int_set( PREF_KEY_MAIN_WINDOW_WIDTH, mainWindowWidth );
+
+    pref_int_set( PREF_KEY_MAIN_WINDOW_X, mainWindowX );
+    pref_int_set( PREF_KEY_MAIN_WINDOW_Y, mainWindowY );
+
+    pref_save(NULL);
+
     /* clear the UI */
     gtk_list_store_clear( GTK_LIST_STORE( tr_core_model( cbdata->core ) ) );