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

Chain up in some size-allocate implementations

Browse Source 
The default implementation does just the right thing for most widgets.
This commit is contained in:
Timm Bäder
2016-09-09 18:32:03 +02:00
committed by Michael Natterer
parent 64a93c6051
commit 53f34ebc0b
7 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/widgets/gimpcircle.c
View File

@ -334,7 +334,7 @@ gimp_circle_size_allocate (GtkWidget *widget,
{ {
GimpCircle *circle = GIMP_CIRCLE (widget); GimpCircle *circle = GIMP_CIRCLE (widget);
gtk_widget_set_allocation (widget, allocation); GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
if (gtk_widget_get_realized (widget)) if (gtk_widget_get_realized (widget))
gdk_window_move_resize (circle->priv->event_window, gdk_window_move_resize (circle->priv->event_window,

9
app/widgets/gimpoverlaybox.c
View File

@ -210,14 +210,7 @@ gimp_overlay_box_size_allocate (GtkWidget *widget,
GimpOverlayBox *box = GIMP_OVERLAY_BOX (widget); GimpOverlayBox *box = GIMP_OVERLAY_BOX (widget);
GList *list; GList *list;
gtk_widget_set_allocation (widget, allocation); GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
if (gtk_widget_get_realized (widget))
gdk_window_move_resize (gtk_widget_get_window (widget),
allocation->x,
allocation->y,
allocation->width,
allocation->height);
for (list = box->children; list; list = g_list_next (list)) for (list = box->children; list; list = g_list_next (list))
gimp_overlay_child_size_allocate (box, list->data); gimp_overlay_child_size_allocate (box, list->data);

2
app/widgets/gimpview.c
View File

@ -376,7 +376,7 @@ gimp_view_size_allocate (GtkWidget *widget,
allocation->width = width; allocation->width = width;
allocation->height = height; allocation->height = height;
gtk_widget_set_allocation (widget, allocation); GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
if (gtk_widget_get_realized (widget)) if (gtk_widget_get_realized (widget))
gdk_window_move_resize (view->event_window, gdk_window_move_resize (view->event_window,

3
libgimpwidgets/gimpcolorarea.c
View File

@ -343,8 +343,7 @@ gimp_color_area_size_allocate (GtkWidget *widget,
{ {
GimpColorArea *area = GIMP_COLOR_AREA (widget); GimpColorArea *area = GIMP_COLOR_AREA (widget);
if (GTK_WIDGET_CLASS (parent_class)->size_allocate) GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
if (allocation->width != area->width || if (allocation->width != area->width ||
allocation->height != area->height) allocation->height != area->height)

2
libgimpwidgets/gimpframe.c
View File

@ -149,7 +149,7 @@ gimp_frame_size_allocate (GtkWidget *widget,
GtkWidget *child = gtk_bin_get_child (GTK_BIN (widget)); GtkWidget *child = gtk_bin_get_child (GTK_BIN (widget));
GtkAllocation child_allocation; GtkAllocation child_allocation;
gtk_widget_set_allocation (widget, allocation); GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
gimp_frame_child_allocate (frame, &child_allocation); gimp_frame_child_allocate (frame, &child_allocation);

2
libgimpwidgets/gimpruler.c
View File

@ -863,7 +863,7 @@ gimp_ruler_size_allocate (GtkWidget *widget,
resized = (widget_allocation.width != allocation->width || resized = (widget_allocation.width != allocation->width ||
widget_allocation.height != allocation->height); widget_allocation.height != allocation->height);
gtk_widget_set_allocation (widget, allocation); GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
if (gtk_widget_get_realized (widget)) if (gtk_widget_get_realized (widget))
{ {

2
modules/gimpcolorwheel.c
View File

@ -353,7 +353,7 @@ gimp_color_wheel_size_allocate (GtkWidget *widget,
gint focus_width; gint focus_width;
gint focus_pad; gint focus_pad;
gtk_widget_set_allocation (widget, allocation); GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
gtk_widget_style_get (widget, gtk_widget_style_get (widget,
"focus-line-width", &focus_width, "focus-line-width", &focus_width,