Changeset 1647

Timestamp:

Apr 3, 2007, 8:18:53 AM (16 years ago)

Author:

joshe

Message:

Make evil initial window sizing magic a bit less evil and a bit less magic.

Location:

trunk/gtk

Files:

• dialogs.c (modified) (7 diffs)
• main.c (modified) (2 diffs)
• tr_window.c (modified) (8 diffs)
• tr_window.h (modified) (1 diff)
• util.c (modified) (1 diff)
• util.h (modified) (1 diff)

trunk/gtk/dialogs.c

@@ -90 +90 @@
 stylekludge( GObject * obj, GParamSpec * spec, gpointer data );
 static void
-setscroll( void * arg );
-static void
-fileswindresp( GtkWidget * widget, gint resp, gpointer data );
+fileswinddead( GtkWidget * widget, gpointer data );
 static void
 filestorclosed( gpointer data, GObject * tor );
@@ -428 +426 @@
     int                 ii;
     GtkWidget         * view, * scroll, * frame, * wind;
-    GtkCellRenderer   * rend;
+    GtkCellRenderer   * rend, * elip;
     GtkTreeViewColumn * col;
     GtkTreeSelection  * sel;
@@ -452 +450 @@
     /* add file column */
     col = gtk_tree_view_column_new();
+    gtk_tree_view_column_set_expand( col, TRUE );
+    gtk_tree_view_column_set_sizing( col, GTK_TREE_VIEW_COLUMN_AUTOSIZE );
     gtk_tree_view_column_set_title( col, _("File") );
     /* add icon renderer */
@@ -459 +459 @@
     /* add text renderer */
     rend = gtk_cell_renderer_text_new();
+    elip = rend;
     gtk_tree_view_column_pack_start( col, rend, TRUE );
     gtk_tree_view_column_add_attribute( col, rend, "markup", FC_LABEL );
@@ -484 +485 @@
     /* create the scrolled window and stick the view in it */
     scroll = gtk_scrolled_window_new( NULL, NULL );
-    gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scroll ),
-                                    GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC );
     gtk_container_add( GTK_CONTAINER( scroll ), view );
     gtk_widget_show( scroll );
@@ -517 +516 @@
 
     g_object_weak_ref( G_OBJECT( tor ), filestorclosed, fw );
-    g_signal_connect( wind, "response", G_CALLBACK( fileswindresp ), fw );
+    g_signal_connect( wind, "destroy", G_CALLBACK( fileswinddead ), fw );
+    g_signal_connect( wind, "response", G_CALLBACK( gtk_widget_destroy ), 0 );
     fileswindupdate( fw );
 
-    /* show the window with a nice initial size */
-    windowsizehack( wind, scroll, view, setscroll, scroll );
+    sizingmagic( GTK_WINDOW( wind ), GTK_SCROLLED_WINDOW( scroll ),
+                 GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
+    g_object_set( elip, "ellipsize", PANGO_ELLIPSIZE_END, NULL );
+    gtk_widget_show( wind );
 }
 
@@ -538 +540 @@
 
 static void
-setscroll( void * arg )
-{
-    gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( arg ),
-        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
-}
-
-static void
-fileswindresp( GtkWidget * widget SHUTUP, gint resp SHUTUP, gpointer data )
+fileswinddead( GtkWidget * widget SHUTUP, gpointer data )
 {
     struct fileswind * fw = data;

trunk/gtk/main.c

@@ -424 +424 @@
     updatemodel( cbdata );
 
-    /* this shows the window */
-    tr_window_size_hack( wind );
-
     /* set up the ipc socket now that we're ready to get torrents from it */
     ipc_socket_setup( GTK_WINDOW( wind ), addtorrents, wannaquit, cbdata );
+
+    /* show the window */
+    tr_window_show( wind );
 }
 
@@ -470 +470 @@
     win = tr_window_new();
     winsetup( cbdata, TR_WINDOW( win ) );
-
-    /* this shows the window */
-    tr_window_size_hack( TR_WINDOW( win ) );
+    tr_window_show( TR_WINDOW( win ) );
 }
 

trunk/gtk/tr_window.c

@@ -40 +40 @@
 {
     PROP_MODEL = 1,
-    PROP_ELLIPSIZE,
     PROP_SELECTION,
     PROP_DOUBLECLICK,
@@ -133 +132 @@
     g_object_class_install_property( gobject_class, PROP_MODEL, pspec );
 
-    pspec = g_param_spec_boolean( "ellipsize", _("Ellipsize"),
-                                 _("Ellipsize torrent names."),
-                                 FALSE, G_PARAM_READWRITE );
-    g_object_class_install_property( gobject_class, PROP_ELLIPSIZE, pspec );
-
     pspec = g_param_spec_object( "selection", _("Selection"),
                                  _("The GtkTreeSelection for the list view."),
@@ -200 +194 @@
                         FALSE, FALSE, 0 );
 
-    gtk_scrolled_window_set_policy( self->scroll,
-                                    GTK_POLICY_NEVER, GTK_POLICY_ALWAYS );
     gtk_container_add( GTK_CONTAINER( scroll ), GTK_WIDGET( self->view ) );
     gtk_box_pack_start( GTK_BOX( vbox ), scroll, TRUE, TRUE, 0 );
@@ -221 +213 @@
 {
     TrWindow         * self = ( TrWindow * )object;
-    PangoEllipsizeMode elip;
 
     if( self->disposed )
@@ -232 +223 @@
         case PROP_MODEL:
             gtk_tree_view_set_model( self->view, g_value_get_object( value ) );
-            break;
-        case PROP_ELLIPSIZE:
-            g_assert( NULL != self->namerend );
-            elip = ( g_value_get_boolean( value ) ?
-                     PANGO_ELLIPSIZE_END : PANGO_ELLIPSIZE_NONE );
-            g_object_set( self->namerend, "ellipsize", elip, NULL );
             break;
         case PROP_DOUBLECLICK:
@@ -253 +238 @@
 {
     TrWindow         * self = ( TrWindow * )object;
-    PangoEllipsizeMode elip;
 
     if( self->disposed )
@@ -264 +248 @@
         case PROP_MODEL:
             g_value_set_object( value, gtk_tree_view_get_model( self->view ) );
-            break;
-        case PROP_ELLIPSIZE:
-            g_assert( NULL != self->namerend );
-            g_object_get( self->namerend, "ellipsize", &elip, NULL);
-            g_value_set_boolean( value, ( PANGO_ELLIPSIZE_NONE != elip ) );
             break;
         case PROP_SELECTION:
@@ -386 +365 @@
 }
 
-static void
-setelip( void * arg )
-{
-    g_object_set( arg, "ellipsize", TRUE, NULL );
-}
-
 void
-tr_window_size_hack( TrWindow * self )
+tr_window_show( TrWindow * self )
 {
     TR_IS_WINDOW( self );
 
-    windowsizehack( GTK_WIDGET( self ), GTK_WIDGET( self->scroll ),
-                    GTK_WIDGET( self->view ), setelip, self );
+    sizingmagic( GTK_WINDOW( self ), self->scroll,
+                 GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS );
+    g_object_set( self->namerend, "ellipsize", PANGO_ELLIPSIZE_END, NULL );
+    gtk_widget_show( GTK_WIDGET( self ) );
 }
 

trunk/gtk/tr_window.h

@@ -85 +85 @@
 tr_window_update( TrWindow * wind, float downspeed, float upspeed );
 
-/* some evil magic to show the window with a nice initial window size */
-/* note that the gtk main loop runs in this function */
+/* some magic to show the window with a nice initial size */
 void
-tr_window_size_hack( TrWindow * wind );
+tr_window_show( TrWindow * wind );
 
 #endif

trunk/gtk/util.c

@@ -318 +318 @@
 
 void
-windowsizehack( GtkWidget * wind, GtkWidget * scroll, GtkWidget * view,
-                callbackfunc_t func, void * arg )
+sizingmagic( GtkWindow * wind, GtkScrolledWindow * scroll,
+             GtkPolicyType hscroll, GtkPolicyType vscroll )
 {
     GtkRequisition req;
-    gint           width, height;
     GdkScreen    * screen;
-
-    gtk_widget_realize( wind );
-    gtk_widget_size_request( view, &req );
-    height = req.height;
-    gtk_widget_size_request( scroll, &req );
-    height -= req.height;
-    gtk_widget_size_request( wind, &req );
-    height += req.height;
-    screen  = gtk_widget_get_screen( wind );
-    width   = MIN( req.width, gdk_screen_get_width( screen  ) / 2 );
-    height  = MIN( height,    gdk_screen_get_height( screen ) / 5 * 4 );
-    if( height > req.width )
-    {
-        height = MIN( height, width * 8 / 5 );
-    }
-    else
-    {
-        height = MAX( height, width * 5 / 8 );
-    }
-    if( height > req.width )
-    {
-        height = MIN( height, width * 8 / 5 );
-    }
-    else
-    {
-        height = MAX( height, width * 5 / 8 );
-    }
-    if( NULL != func )
-    {
-        func( arg );
-    }
-    gtk_widget_show_now( wind  );
-    gtk_window_resize( GTK_WINDOW( wind ), width, height );
-    gtk_window_set_focus( GTK_WINDOW( wind ), NULL );
+    int            width, height;
+
+    screen = gtk_widget_get_screen( GTK_WIDGET( wind ) );
+
+    gtk_scrolled_window_set_policy( scroll, GTK_POLICY_NEVER,
+                                    GTK_POLICY_NEVER );
+
+    gtk_widget_size_request( GTK_WIDGET( wind ), &req );
+    height = MIN( req.height, gdk_screen_get_height( screen ) / 5 * 4 );
+
+    gtk_scrolled_window_set_policy( scroll, GTK_POLICY_NEVER, vscroll );
+
+    gtk_widget_size_request( GTK_WIDGET( wind ), &req );
+    width = MIN( req.width, gdk_screen_get_width( screen ) / 2 );
+
+    gtk_window_set_default_size( wind, width, height );
+
+    gtk_scrolled_window_set_policy( scroll, hscroll, vscroll );
 }
 

trunk/gtk/util.h

@@ -154 +154 @@
 /* here there be dragons */
 void
-windowsizehack( GtkWidget * wind, GtkWidget * scroll, GtkWidget * view,
-                callbackfunc_t func, void * arg );
+sizingmagic( GtkWindow * wind, GtkScrolledWindow * scroll,
+             GtkPolicyType hscroll, GtkPolicyType vscroll );
 
 /* create an error dialog, if wind is NULL or mapped then show dialog now,