Raise the grip window when appropriate.

2004-11-09  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkstatusbar.c (gtk_statusbar_init): Raise the grip
	window when appropriate.

diff --git a/ChangeLog b/ChangeLog
index 4d6f44551bfc6af2aba1955b70710401811da513..2a354dd39db3a2712fcef53c39807da931054ba3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-11-09  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkstatusbar.c (gtk_statusbar_init): Raise the grip
+       window when appropriate.
+
        * gtk/gtkcombobox.c (find_menu_by_path) 
        (gtk_combo_box_menu_fill_level, gtk_combo_box_menu_row_inserted): 
        Use a row reference, not a path, to associate separators

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4d6f44551bfc6af2aba1955b70710401811da513..2a354dd39db3a2712fcef53c39807da931054ba3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-11-09  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkstatusbar.c (gtk_statusbar_init): Raise the grip
+       window when appropriate.
+
        * gtk/gtkcombobox.c (find_menu_by_path) 
        (gtk_combo_box_menu_fill_level, gtk_combo_box_menu_row_inserted): 
        Use a row reference, not a path, to associate separators

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4d6f44551bfc6af2aba1955b70710401811da513..2a354dd39db3a2712fcef53c39807da931054ba3 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-11-09  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkstatusbar.c (gtk_statusbar_init): Raise the grip
+       window when appropriate.
+
        * gtk/gtkcombobox.c (find_menu_by_path) 
        (gtk_combo_box_menu_fill_level, gtk_combo_box_menu_row_inserted): 
        Use a row reference, not a path, to associate separators

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4d6f44551bfc6af2aba1955b70710401811da513..2a354dd39db3a2712fcef53c39807da931054ba3 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-11-09  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkstatusbar.c (gtk_statusbar_init): Raise the grip
+       window when appropriate.
+
        * gtk/gtkcombobox.c (find_menu_by_path) 
        (gtk_combo_box_menu_fill_level, gtk_combo_box_menu_row_inserted): 
        Use a row reference, not a path, to associate separators

diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index c7cb374a8a07a23f902c00d28dcde5ca7708180d..33a2d891ddfa46783976dcbb2aacd82289806363 100644 (file)
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -88,6 +88,9 @@ static void     gtk_statusbar_set_property      (GObject           *object,
                                                 guint              prop_id,
                                                 const GValue      *value,
                                                 GParamSpec        *pspec);
+static void     label_selectable_changed        (GtkWidget         *label,
+                                                 GParamSpec        *pspec,
+                                                gpointer           data);
 
 
 static GtkContainerClass *parent_class;
@@ -231,6 +234,8 @@ gtk_statusbar_init (GtkStatusbar *statusbar)
   /* don't expand the size request for the label; if we
    * do that then toplevels weirdly resize
    */
+  g_signal_connect (statusbar->label, "notify::selectable",
+                   G_CALLBACK (label_selectable_changed), statusbar);
   gtk_widget_set_size_request (statusbar->label, 1, -1);
   gtk_container_add (GTK_CONTAINER (statusbar->frame), statusbar->label);
   gtk_widget_show (statusbar->label);
@@ -418,7 +423,8 @@ gtk_statusbar_set_has_resize_grip (GtkStatusbar *statusbar,
           if (statusbar->has_resize_grip && statusbar->grip_window == NULL)
            {
              gtk_statusbar_create_window (statusbar);
-             gdk_window_show (statusbar->grip_window);
+             if (GTK_WIDGET_MAPPED (statusbar))
+               gdk_window_show (statusbar->grip_window);
            }
           else if (!statusbar->has_resize_grip && statusbar->grip_window != NULL)
             gtk_statusbar_destroy_window (statusbar);
@@ -775,10 +781,22 @@ gtk_statusbar_size_allocate  (GtkWidget     *widget,
       GdkRectangle rect;
       
       get_grip_rect (statusbar, &rect);
-  
-        gdk_window_move_resize (statusbar->grip_window,
-                                rect.x, rect.y,
-                                rect.width, rect.height);
+      
+      gdk_window_raise (statusbar->grip_window);
+      gdk_window_move_resize (statusbar->grip_window,
+                             rect.x, rect.y,
+                             rect.width, rect.height);
     }
 }
 
+static void
+label_selectable_changed (GtkWidget  *label,
+                         GParamSpec *pspec,
+                         gpointer    data)
+{
+  GtkStatusbar *statusbar = GTK_STATUSBAR (data);
+
+  if (statusbar && 
+      statusbar->has_resize_grip && statusbar->grip_window)
+    gdk_window_raise (statusbar->grip_window);
+}