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

Make the event_window large enough to cover the full height of the

Browse Source 
2006-10-01  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkexpander.c (gtk_expander_realize)
	(gtk_expander_size_allocate): Make the event_window large
	enough to cover the full height of the label_widget.  (#358351,
	Scott Horowitz)
This commit is contained in:
Matthias Clasen 2006-10-02 03:50:38 +00:00 committed by Matthias Clasen
parent c247b1bc4a
commit aab95f48a7
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2006-10-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkexpander.c (gtk_expander_realize)
(gtk_expander_size_allocate): Make the event_window large
enough to cover the full height of the label_widget. (#358351,
Scott Horowitz)
2006-10-01 Tor Lillqvist <tml@novell.com> 2006-10-01 Tor Lillqvist <tml@novell.com>
* gtk/gtkfilesystemwin32.c: Same change as to gtkfilesystemunix.c. * gtk/gtkfilesystemwin32.c: Same change as to gtkfilesystemunix.c.

21
gtk/gtkexpander.c
View File

@ -370,6 +370,7 @@ gtk_expander_realize (GtkWidget *widget)
gint attributes_mask; gint attributes_mask;
gint border_width; gint border_width;
GdkRectangle expander_rect; GdkRectangle expander_rect;
gint label_height;
priv = GTK_EXPANDER (widget)->priv; priv = GTK_EXPANDER (widget)->priv;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
@ -378,11 +379,21 @@ gtk_expander_realize (GtkWidget *widget)
get_expander_bounds (GTK_EXPANDER (widget), &expander_rect); get_expander_bounds (GTK_EXPANDER (widget), &expander_rect);
if (priv->label_widget && GTK_WIDGET_VISIBLE (priv->label_widget))
{
GtkRequisition label_requisition;
gtk_widget_get_child_requisition (priv->label_widget, &label_requisition);
label_height = label_requisition.height;
}
else
label_height = 0;
attributes.window_type = GDK_WINDOW_CHILD; attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = widget->allocation.x + border_width; attributes.x = widget->allocation.x + border_width;
attributes.y = expander_rect.y; attributes.y = widget->allocation.y + border_width;
attributes.width = MAX (widget->allocation.width - 2 * border_width, 1); attributes.width = MAX (widget->allocation.width - 2 * border_width, 1);
attributes.height = expander_rect.width; attributes.height = MAX (expander_rect.height, label_height - 2 * border_width);
attributes.wclass = GDK_INPUT_ONLY; attributes.wclass = GDK_INPUT_ONLY;
attributes.event_mask = gtk_widget_get_events (widget) | attributes.event_mask = gtk_widget_get_events (widget) |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_PRESS_MASK |
@ -636,8 +647,10 @@ gtk_expander_size_allocate (GtkWidget *widget,
get_expander_bounds (expander, &rect); get_expander_bounds (expander, &rect);
gdk_window_move_resize (priv->event_window, gdk_window_move_resize (priv->event_window,
allocation->x + border_width, rect.y, allocation->x + border_width,
MAX (allocation->width - 2 * border_width, 1), rect.width); allocation->y + border_width,
MAX (allocation->width - 2 * border_width, 1),
MAX (rect.height, label_height - 2 * border_width));
} }
if (child_visible) if (child_visible)