summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimm Bäder <mail@baedert.org>2017-05-02 19:11:53 +0200
committerTimm Bäder <mail@baedert.org>2017-05-05 11:18:05 +0200
commit91932ffbc719350fcf629cfa753681de871685f0 (patch)
treedb20b1984ce29deaf68a911f2dea1f24aaae2c69
parent7625e40e8293aa2bf76bf2b53ce888d80cf644e2 (diff)
downloadgtk+-91932ffbc719350fcf629cfa753681de871685f0.tar.gz
button: Remove baseline_align value
It's unused.
-rw-r--r--gtk/gtkbuttonprivate.h3
-rw-r--r--gtk/gtkcheckbutton.c11
-rw-r--r--gtk/gtkmodelbutton.c12
3 files changed, 0 insertions, 26 deletions
diff --git a/gtk/gtkbuttonprivate.h b/gtk/gtkbuttonprivate.h
index a9e93e02d2..075f855012 100644
--- a/gtk/gtkbuttonprivate.h
+++ b/gtk/gtkbuttonprivate.h
@@ -36,9 +36,6 @@ struct _GtkButtonPrivate
GtkGesture *gesture;
- /* This is only used by checkbox and subclasses */
- gfloat baseline_align;
-
guint activate_timeout;
guint button_down : 1;
diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
index 66f597beff..c0fd79304e 100644
--- a/gtk/gtkcheckbutton.c
+++ b/gtk/gtkcheckbutton.c
@@ -415,8 +415,6 @@ gtk_check_button_size_allocate (GtkWidget *widget,
GtkButton *button = GTK_BUTTON (widget);
GtkCssGadget *gadget;
GdkRectangle clip;
- PangoContext *pango_context;
- PangoFontMetrics *metrics;
if (priv->draw_indicator)
gadget = priv->gadget;
@@ -431,15 +429,6 @@ gtk_check_button_size_allocate (GtkWidget *widget,
gtk_widget_set_clip (widget, &clip);
- pango_context = gtk_widget_get_pango_context (widget);
- metrics = pango_context_get_metrics (pango_context,
- pango_context_get_font_description (pango_context),
- pango_context_get_language (pango_context));
- button->priv->baseline_align =
- (double)pango_font_metrics_get_ascent (metrics) /
- (pango_font_metrics_get_ascent (metrics) + pango_font_metrics_get_descent (metrics));
- pango_font_metrics_unref (metrics);
-
if (gtk_widget_get_realized (widget))
{
GtkAllocation border_allocation;
diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c
index baa568af73..7c84725f88 100644
--- a/gtk/gtkmodelbutton.c
+++ b/gtk/gtkmodelbutton.c
@@ -807,8 +807,6 @@ gtk_model_button_allocate (GtkCssGadget *gadget,
{
GtkWidget *widget;
GtkModelButton *button;
- PangoContext *pango_context;
- PangoFontMetrics *metrics;
GtkAllocation child_allocation;
GtkWidget *child;
gint check_min_width, check_nat_width;
@@ -874,16 +872,6 @@ gtk_model_button_allocate (GtkCssGadget *gadget,
gtk_widget_size_allocate_with_baseline (child, &child_allocation, baseline);
}
- pango_context = gtk_widget_get_pango_context (widget);
- metrics = pango_context_get_metrics (pango_context,
- pango_context_get_font_description (pango_context),
- pango_context_get_language (pango_context));
- GTK_BUTTON (button)->priv->baseline_align =
- (double)pango_font_metrics_get_ascent (metrics) /
- (pango_font_metrics_get_ascent (metrics) + pango_font_metrics_get_descent (metrics));
- pango_font_metrics_unref (metrics);
-
-
if (gtk_widget_get_realized (widget))
{
GtkAllocation border_allocation;