AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GtkLabel: Minor cleanup

Browse Source 
Make sure we always compare for a set baseline in the same way.
I.e. baseline != -1, never baseline >= 0.
This commit is contained in:
Alexander Larsson 2013-03-27 09:44:02 +01:00
parent ac8817d34b
commit e253a414b0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtklabel.c
View File

@ -3801,9 +3801,9 @@ gtk_label_get_preferred_height_and_baseline_for_width (GtkWidget *widget,
minimum_height, natural_height,
minimum_baseline, natural_baseline);
if (minimum_baseline && *minimum_baseline >= 0)
if (minimum_baseline && *minimum_baseline != -1)
*minimum_baseline += border.top;
if (natural_baseline && *natural_baseline >= 0)
if (natural_baseline && *natural_baseline != -1)
*natural_baseline += border.top;
if (minimum_height)
@ -3954,7 +3954,7 @@ get_layout_location (GtkLabel *label,
baseline_offset = 0;
baseline = gtk_widget_get_allocated_baseline (widget);
if (baseline >= 0 && !priv->have_transform)
if (baseline != -1 && !priv->have_transform)
{
layout_baseline = pango_layout_get_baseline (priv->layout) / PANGO_SCALE;
baseline_offset = baseline - layout_baseline;