callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Raise the grip window when appropriate.

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

	* gtk/gtkstatusbar.c (gtk_statusbar_init): Raise the grip
	window when appropriate.
This commit is contained in:
Matthias Clasen
2004-11-09 17:20:04 +00:00
committed by Matthias Clasen
parent 05a16d62a9
commit df40795df8
5 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2004-11-09 Matthias Clasen <mclasen@redhat.com> 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/gtkcombobox.c (find_menu_by_path)
(gtk_combo_box_menu_fill_level, gtk_combo_box_menu_row_inserted): (gtk_combo_box_menu_fill_level, gtk_combo_box_menu_row_inserted):
Use a row reference, not a path, to associate separators Use a row reference, not a path, to associate separators

3
ChangeLog.pre-2-10
View File

@ -1,5 +1,8 @@
2004-11-09 Matthias Clasen <mclasen@redhat.com> 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/gtkcombobox.c (find_menu_by_path)
(gtk_combo_box_menu_fill_level, gtk_combo_box_menu_row_inserted): (gtk_combo_box_menu_fill_level, gtk_combo_box_menu_row_inserted):
Use a row reference, not a path, to associate separators Use a row reference, not a path, to associate separators

3
ChangeLog.pre-2-6
View File

@ -1,5 +1,8 @@
2004-11-09 Matthias Clasen <mclasen@redhat.com> 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/gtkcombobox.c (find_menu_by_path)
(gtk_combo_box_menu_fill_level, gtk_combo_box_menu_row_inserted): (gtk_combo_box_menu_fill_level, gtk_combo_box_menu_row_inserted):
Use a row reference, not a path, to associate separators Use a row reference, not a path, to associate separators

3
ChangeLog.pre-2-8
View File

@ -1,5 +1,8 @@
2004-11-09 Matthias Clasen <mclasen@redhat.com> 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/gtkcombobox.c (find_menu_by_path)
(gtk_combo_box_menu_fill_level, gtk_combo_box_menu_row_inserted): (gtk_combo_box_menu_fill_level, gtk_combo_box_menu_row_inserted):
Use a row reference, not a path, to associate separators Use a row reference, not a path, to associate separators

28
gtk/gtkstatusbar.c
View File

@ -88,6 +88,9 @@ static void gtk_statusbar_set_property (GObject *object,
guint prop_id, guint prop_id,
const GValue *value, const GValue *value,
GParamSpec *pspec); GParamSpec *pspec);
static void label_selectable_changed (GtkWidget *label,
GParamSpec *pspec,
gpointer data);
static GtkContainerClass *parent_class; static GtkContainerClass *parent_class;
@ -231,6 +234,8 @@ gtk_statusbar_init (GtkStatusbar *statusbar)
/* don't expand the size request for the label; if we /* don't expand the size request for the label; if we
* do that then toplevels weirdly resize * 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_widget_set_size_request (statusbar->label, 1, -1);
gtk_container_add (GTK_CONTAINER (statusbar->frame), statusbar->label); gtk_container_add (GTK_CONTAINER (statusbar->frame), statusbar->label);
gtk_widget_show (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) if (statusbar->has_resize_grip && statusbar->grip_window == NULL)
{ {
gtk_statusbar_create_window (statusbar); 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) else if (!statusbar->has_resize_grip && statusbar->grip_window != NULL)
gtk_statusbar_destroy_window (statusbar); gtk_statusbar_destroy_window (statusbar);
@ -775,10 +781,22 @@ gtk_statusbar_size_allocate (GtkWidget *widget,
GdkRectangle rect; GdkRectangle rect;
get_grip_rect (statusbar, &rect); get_grip_rect (statusbar, &rect);
gdk_window_move_resize (statusbar->grip_window, gdk_window_raise (statusbar->grip_window);
rect.x, rect.y, gdk_window_move_resize (statusbar->grip_window,
rect.width, rect.height); 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);
}