[gtk+] GtkLabel: Drop use of GtkMisc::x/yalign
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] GtkLabel: Drop use of GtkMisc::x/yalign
- Date: Sat, 24 May 2014 04:48:29 +0000 (UTC)
commit b320c198b6d325c35e6f6d32f4f841a913efa956
Author: Matthias Clasen <mclasen redhat com>
Date: Thu May 22 21:19:49 2014 -0400
GtkLabel: Drop use of GtkMisc::x/yalign
Instead, use GtkWidget::h/valign to position the text inside
the allocation. And just stop using GtkMisc::x/ypad.
https://bugzilla.gnome.org/show_bug.cgi?id=730613
gtk/gtklabel.c | 91 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 73 insertions(+), 18 deletions(-)
---
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index b3ed083..68c23d3 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -962,6 +962,7 @@ gtk_label_class_init (GtkLabelClass *class)
G_MAXINT,
-1,
GTK_PARAM_READWRITE));
+
/*
* Key bindings
*/
@@ -3219,6 +3220,17 @@ gtk_label_get_measuring_layout (GtkLabel * label,
}
static void
+gtk_label_get_border (GtkLabel *label, GtkBorder *border)
+{
+ GtkStyleContext *context;
+ GtkStateFlags state;
+
+ context = gtk_widget_get_style_context (GTK_WIDGET (label));
+ state = gtk_widget_get_state_flags (GTK_WIDGET (label));
+ gtk_style_context_get_border (context, state, border);
+}
+
+static void
gtk_label_update_layout_width (GtkLabel *label)
{
GtkLabelPrivate *priv = label->priv;
@@ -3232,9 +3244,7 @@ gtk_label_update_layout_width (GtkLabel *label)
PangoRectangle logical;
gint width, height;
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- _gtk_misc_get_padding_and_border (GTK_MISC (label), &border);
-G_GNUC_END_IGNORE_DEPRECATIONS
+ gtk_label_get_border (label, &border);
width = gtk_widget_get_allocated_width (GTK_WIDGET (label)) - border.left - border.right;
height = gtk_widget_get_allocated_height (GTK_WIDGET (label)) - border.top - border.bottom;
@@ -3651,9 +3661,7 @@ gtk_label_get_preferred_size (GtkWidget *widget,
smallest_rect.width = PANGO_PIXELS_CEIL (smallest_rect.width);
smallest_rect.height = PANGO_PIXELS_CEIL (smallest_rect.height);
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- _gtk_misc_get_padding_and_border (GTK_MISC (label), &border);
-G_GNUC_END_IGNORE_DEPRECATIONS
+ gtk_label_get_border (label, &border);
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
@@ -3757,9 +3765,7 @@ gtk_label_get_preferred_width_for_height (GtkWidget *widget,
{
GtkBorder border;
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- _gtk_misc_get_padding_and_border (GTK_MISC (label), &border);
-G_GNUC_END_IGNORE_DEPRECATIONS
+ gtk_label_get_border (label, &border);
if (priv->wrap)
gtk_label_clear_layout (label);
@@ -3794,9 +3800,7 @@ gtk_label_get_preferred_height_and_baseline_for_width (GtkWidget *widget,
{
GtkBorder border;
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- _gtk_misc_get_padding_and_border (GTK_MISC (label), &border);
-G_GNUC_END_IGNORE_DEPRECATIONS
+ gtk_label_get_border (label, &border);
if (priv->wrap)
gtk_label_clear_layout (label);
@@ -3922,6 +3926,60 @@ gtk_label_style_updated (GtkWidget *widget)
gtk_label_update_layout_attributes (label);
}
+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 void
get_layout_location (GtkLabel *label,
gint *xp,
@@ -3940,13 +3998,10 @@ get_layout_location (GtkLabel *label,
widget = GTK_WIDGET (label);
priv = label->priv;
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- gtk_misc_get_alignment (GTK_MISC (label), &xalign, &yalign);
- _gtk_misc_get_padding_and_border (GTK_MISC (label), &border);
-G_GNUC_END_IGNORE_DEPRECATIONS
+ gtk_label_get_border (label, &border);
- if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_LTR)
- xalign = 1.0 - xalign;
+ xalign = halign_to_float (widget);
+ yalign = valign_to_float (widget);
pango_layout_get_extents (priv->layout, NULL, &logical);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]