diff options
author | Timm Bäder <mail@baedert.org> | 2019-09-13 11:53:24 +0200 |
---|---|---|
committer | Timm Bäder <mail@baedert.org> | 2019-09-13 11:53:24 +0200 |
commit | 86cc7f69259d0b3c4689ac9d14c5b9188be52a8c (patch) | |
tree | 6a9f57e837c215e5b3243f5a81cc19dda6cb1be7 /gtk/gtkfontbutton.c | |
parent | adb77e1a92e41816e090b3ecab4f853b361ed13d (diff) | |
download | gtk+-86cc7f69259d0b3c4689ac9d14c5b9188be52a8c.tar.gz |
fontbutton: Use a bin layout
Diffstat (limited to 'gtk/gtkfontbutton.c')
-rw-r--r-- | gtk/gtkfontbutton.c | 41 |
1 files 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" @@ -482,45 +483,11 @@ gtk_font_button_font_chooser_notify (GObject *object, } 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")); } |