[gtk/wip/baedert/for-master] fontbutton: Use a bin layout
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/baedert/for-master] fontbutton: Use a bin layout
- Date: Fri, 13 Sep 2019 12:03:45 +0000 (UTC)
commit 86cc7f69259d0b3c4689ac9d14c5b9188be52a8c
Author: Timm Bäder <mail baedert org>
Date: Fri Sep 13 11:53:24 2019 +0200
fontbutton: Use a bin layout
gtk/gtkfontbutton.c | 41 +++--------------------------------------
1 file changed, 3 insertions(+), 38 deletions(-)
---
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index db2aa4dc64..72d71a7fb8 100644
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -29,6 +29,7 @@
#include "gtkfontbutton.h"
+#include "gtkbinlayout.h"
#include "gtkbox.h"
#include "gtkcssprovider.h"
#include "gtkfontchooser.h"
@@ -481,46 +482,12 @@ gtk_font_button_font_chooser_notify (GObject *object,
g_object_notify_by_pspec (user_data, pspec);
}
-static void
-gtk_font_button_measure (GtkWidget *widget,
- GtkOrientation orientation,
- int for_size,
- int *minimum,
- int *natural,
- int *minimum_baseline,
- int *natural_baseline)
-{
- GtkFontButton *button = GTK_FONT_BUTTON (widget);
- GtkFontButtonPrivate *priv = gtk_font_button_get_instance_private (button);
-
- gtk_widget_measure (priv->button, orientation, for_size,
- minimum, natural,
- minimum_baseline, natural_baseline);
-}
-
-static void
-gtk_font_button_size_allocate (GtkWidget *widget,
- int width,
- int height,
- int baseline)
-{
- GtkFontButton *button = GTK_FONT_BUTTON (widget);
- GtkFontButtonPrivate *priv = gtk_font_button_get_instance_private (button);
-
- gtk_widget_size_allocate (priv->button,
- &(GtkAllocation) {
- 0, 0,
- width, height
- },
- baseline);
-}
-
static void
gtk_font_button_class_init (GtkFontButtonClass *klass)
{
GObjectClass *gobject_class;
GtkWidgetClass *widget_class;
-
+
gobject_class = (GObjectClass *) klass;
widget_class = (GtkWidgetClass *) klass;
@@ -528,9 +495,6 @@ gtk_font_button_class_init (GtkFontButtonClass *klass)
gobject_class->set_property = gtk_font_button_set_property;
gobject_class->get_property = gtk_font_button_get_property;
- widget_class->measure = gtk_font_button_measure;
- widget_class->size_allocate = gtk_font_button_size_allocate;
-
klass->font_set = NULL;
_gtk_font_chooser_install_properties (gobject_class);
@@ -596,6 +560,7 @@ gtk_font_button_class_init (GtkFontButtonClass *klass)
NULL,
G_TYPE_NONE, 0);
+ gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
gtk_widget_class_set_css_name (widget_class, I_("fontbutton"));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]