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

GtkImage: Drop use of GtkMisc::x/yalign

Browse Source 
Instead, use GtkWidget::h/valign to position the image inside
the allocation. And just stop using GtkMisc::x/ypad.

https://bugzilla.gnome.org/show_bug.cgi?id=730613
This commit is contained in:
Matthias Clasen
2014-05-22 22:51:00 -04:00
parent b320c198b6
commit 54d5b426fc
1 changed files with 62 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
gtk/gtkimage.c
View File

@ -1522,12 +1522,12 @@ gtk_image_get_preferred_size (GtkImage *image,
gint width, height; gint width, height;
GtkBorder border; GtkBorder border;
GtkStyleContext *context; GtkStyleContext *context;
GtkStateFlags state;
context = gtk_widget_get_style_context (GTK_WIDGET (image)); context = gtk_widget_get_style_context (GTK_WIDGET (image));
state = gtk_widget_get_state_flags (GTK_WIDGET (image));
gtk_style_context_get_border (context, state, &border);
_gtk_icon_helper_get_size (priv->icon_helper, context, &width, &height); _gtk_icon_helper_get_size (priv->icon_helper, context, &width, &height);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
_gtk_misc_get_padding_and_border (GTK_MISC (image), &border);
G_GNUC_END_IGNORE_DEPRECATIONS
width += border.left + border.right; width += border.left + border.right;
height += border.top + border.bottom; height += border.top + border.bottom;
@ -1560,6 +1560,60 @@ gtk_image_get_baseline_align (GtkImage *image)
return image->priv->baseline_align; return image->priv->baseline_align;
} }
static gfloat
halign_to_float (GtkWidget *widget)
{
gfloat ret = 0.5;
switch (gtk_widget_get_halign (widget))
{
case GTK_ALIGN_FILL:
case GTK_ALIGN_CENTER:
ret = 0.5;
break;
case GTK_ALIGN_START:
ret = 0.0;
break;
case GTK_ALIGN_END:
ret = 1.0;
break;
case GTK_ALIGN_BASELINE:
ret = 0.0;
g_assert_not_reached ();
break;
}
if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_LTR)
ret = 1.0 - ret;
return ret;
}
static gfloat
valign_to_float (GtkWidget *widget)
{
gfloat ret = 0.5;
switch (gtk_widget_get_valign (widget))
{
case GTK_ALIGN_FILL:
case GTK_ALIGN_CENTER:
ret = 0.5;
break;
case GTK_ALIGN_START:
ret = 0.0;
break;
case GTK_ALIGN_END:
ret = 1.0;
break;
case GTK_ALIGN_BASELINE:
ret = 0.0;
break;
}
return ret;
}
static gint static gint
gtk_image_draw (GtkWidget *widget, gtk_image_draw (GtkWidget *widget,
cairo_t *cr) cairo_t *cr)
@ -1570,6 +1624,7 @@ gtk_image_draw (GtkWidget *widget,
gint x, y, width, height, baseline; gint x, y, width, height, baseline;
gfloat xalign, yalign; gfloat xalign, yalign;
GtkBorder border; GtkBorder border;
GtkStateFlags state;
g_return_val_if_fail (GTK_IS_IMAGE (widget), FALSE); g_return_val_if_fail (GTK_IS_IMAGE (widget), FALSE);
@ -1577,6 +1632,7 @@ gtk_image_draw (GtkWidget *widget,
priv = image->priv; priv = image->priv;
context = gtk_widget_get_style_context (widget); context = gtk_widget_get_style_context (widget);
state = gtk_widget_get_state_flags (widget);
gtk_render_background (context, cr, gtk_render_background (context, cr,
0, 0, 0, 0,
@ -1585,14 +1641,10 @@ gtk_image_draw (GtkWidget *widget,
0, 0, 0, 0,
gtk_widget_get_allocated_width (widget), gtk_widget_get_allocated_height (widget)); gtk_widget_get_allocated_width (widget), gtk_widget_get_allocated_height (widget));
G_GNUC_BEGIN_IGNORE_DEPRECATIONS xalign = halign_to_float (widget);
gtk_misc_get_alignment (GTK_MISC (image), &xalign, &yalign); yalign = valign_to_float (widget);
_gtk_misc_get_padding_and_border (GTK_MISC (image), &border);
G_GNUC_END_IGNORE_DEPRECATIONS
gtk_image_get_preferred_size (image, &width, &height);
if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_LTR) gtk_image_get_preferred_size (image, &width, &height);
xalign = 1.0 - xalign;
baseline = gtk_widget_get_allocated_baseline (widget); baseline = gtk_widget_get_allocated_baseline (widget);