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

levelbar: Use a bin layout

Browse Source
This commit is contained in:
Timm Bäder 2019-09-21 12:56:09 +02:00
parent 3fcd39f659
commit ca3d855c44
1 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gtk/gtklevelbar.c
View File

@ -119,6 +119,7 @@
*/ */
#include "config.h" #include "config.h"
#include "gtkbinlayout.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"
#include "gtkbuilderprivate.h" #include "gtkbuilderprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
@ -418,24 +419,6 @@ gtk_level_bar_measure_trough (GtkGizmo *gizmo,
*natural = size; *natural = size;
} }
static void
gtk_level_bar_measure (GtkWidget *widget,
GtkOrientation orientation,
int for_size,
int *minimum,
int *natural,
int *minimum_baseline,
int *natural_baseline)
{
GtkLevelBarPrivate *priv = gtk_level_bar_get_instance_private (GTK_LEVEL_BAR (widget));
gtk_widget_measure (priv->trough_widget,
orientation,
for_size,
minimum, natural,
minimum_baseline, natural_baseline);
}
static void static void
gtk_level_bar_allocate_trough_continuous (GtkLevelBar *self, gtk_level_bar_allocate_trough_continuous (GtkLevelBar *self,
int width, int width,
@ -552,21 +535,6 @@ gtk_level_bar_allocate_trough (GtkGizmo *gizmo,
gtk_level_bar_allocate_trough_discrete (self, width, height, baseline); gtk_level_bar_allocate_trough_discrete (self, width, height, baseline);
} }
static void
gtk_level_bar_size_allocate (GtkWidget *widget,
int width,
int height,
int baseline)
{
GtkLevelBarPrivate *priv = gtk_level_bar_get_instance_private (GTK_LEVEL_BAR (widget));
gtk_widget_size_allocate (priv->trough_widget,
&(GtkAllocation) {
0, 0,
width, height
}, baseline);
}
static void static void
update_block_nodes (GtkLevelBar *self) update_block_nodes (GtkLevelBar *self)
{ {
@ -962,8 +930,6 @@ gtk_level_bar_class_init (GtkLevelBarClass *klass)
oclass->set_property = gtk_level_bar_set_property; oclass->set_property = gtk_level_bar_set_property;
oclass->finalize = gtk_level_bar_finalize; oclass->finalize = gtk_level_bar_finalize;
wclass->size_allocate = gtk_level_bar_size_allocate;
wclass->measure = gtk_level_bar_measure;
wclass->direction_changed = gtk_level_bar_direction_changed; wclass->direction_changed = gtk_level_bar_direction_changed;
g_object_class_override_property (oclass, PROP_ORIENTATION, "orientation"); g_object_class_override_property (oclass, PROP_ORIENTATION, "orientation");
@ -1065,6 +1031,7 @@ gtk_level_bar_class_init (GtkLevelBarClass *klass)
g_object_class_install_properties (oclass, LAST_PROPERTY, properties); g_object_class_install_properties (oclass, LAST_PROPERTY, properties);
gtk_widget_class_set_accessible_type (wclass, GTK_TYPE_LEVEL_BAR_ACCESSIBLE); gtk_widget_class_set_accessible_type (wclass, GTK_TYPE_LEVEL_BAR_ACCESSIBLE);
gtk_widget_class_set_layout_manager_type (wclass, GTK_TYPE_BIN_LAYOUT);
gtk_widget_class_set_css_name (wclass, I_("levelbar")); gtk_widget_class_set_css_name (wclass, I_("levelbar"));
} }