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

colorbutton: Use a bin layout

Browse Source
This commit is contained in:
Timm Bäder 2019-09-23 17:00:07 +02:00
parent 5d8c8f33c0
commit 387587dedb
1 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gtk/gtkcolorbutton.c
View File

@ -30,6 +30,7 @@
#include "gtkcolorbutton.h" #include "gtkcolorbutton.h"
#include "gtkbinlayout.h"
#include "gtkbutton.h" #include "gtkbutton.h"
#include "gtkcolorchooser.h" #include "gtkcolorchooser.h"
#include "gtkcolorchooserprivate.h" #include "gtkcolorchooserprivate.h"
@ -147,40 +148,6 @@ G_DEFINE_TYPE_WITH_CODE (GtkColorButton, gtk_color_button, GTK_TYPE_WIDGET,
G_IMPLEMENT_INTERFACE (GTK_TYPE_COLOR_CHOOSER, G_IMPLEMENT_INTERFACE (GTK_TYPE_COLOR_CHOOSER,
gtk_color_button_iface_init)) gtk_color_button_iface_init))
static void
gtk_color_button_measure (GtkWidget *widget,
GtkOrientation orientation,
int for_size,
int *minimum,
int *natural,
int *minimum_baseline,
int *natural_baseline)
{
GtkColorButton *button = GTK_COLOR_BUTTON (widget);
GtkColorButtonPrivate *priv = gtk_color_button_get_instance_private (button);
gtk_widget_measure (priv->button, orientation, for_size,
minimum, natural,
minimum_baseline, natural_baseline);
}
static void
gtk_color_button_size_allocate (GtkWidget *widget,
int width,
int height,
int baseline)
{
GtkColorButton *button = GTK_COLOR_BUTTON (widget);
GtkColorButtonPrivate *priv = gtk_color_button_get_instance_private (button);
gtk_widget_size_allocate (priv->button,
&(GtkAllocation) {
0, 0,
width, height
},
baseline);
}
static void static void
gtk_color_button_class_init (GtkColorButtonClass *klass) gtk_color_button_class_init (GtkColorButtonClass *klass)
{ {
@ -194,8 +161,6 @@ gtk_color_button_class_init (GtkColorButtonClass *klass)
gobject_class->set_property = gtk_color_button_set_property; gobject_class->set_property = gtk_color_button_set_property;
gobject_class->finalize = gtk_color_button_finalize; gobject_class->finalize = gtk_color_button_finalize;
widget_class->measure = gtk_color_button_measure;
widget_class->size_allocate = gtk_color_button_size_allocate;
klass->color_set = NULL; klass->color_set = NULL;
/** /**
@ -275,6 +240,8 @@ gtk_color_button_class_init (GtkColorButtonClass *klass)
P_("Whether to show the color editor right away"), P_("Whether to show the color editor right away"),
FALSE, FALSE,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY)); GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
} }
static void static void