callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch: Set ACTIVE state flag with is_active property

Browse Source
This commit is contained in:
Benjamin Otte
2012-03-30 01:51:04 +02:00
parent 40982eabbb
commit 8e17f9c233
1 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
gtk/gtkswitch.c
View File

@ -308,7 +308,6 @@ gtk_switch_get_preferred_width (GtkWidget *widget,
gint *minimum, gint *minimum,
gint *natural) gint *natural)
{ {
GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv;
GtkStyleContext *context; GtkStyleContext *context;
GtkStateFlags state; GtkStateFlags state;
GtkBorder padding; GtkBorder padding;
@ -317,14 +316,10 @@ gtk_switch_get_preferred_width (GtkWidget *widget,
PangoRectangle logical_rect; PangoRectangle logical_rect;
context = gtk_widget_get_style_context (widget); context = gtk_widget_get_style_context (widget);
state = gtk_widget_get_state_flags (widget); state = gtk_style_context_get_state (context);
if (priv->is_active)
state |= GTK_STATE_FLAG_ACTIVE;
gtk_style_context_save (context); gtk_style_context_save (context);
gtk_style_context_set_state (context, state);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_SLIDER); gtk_style_context_add_class (context, GTK_STYLE_CLASS_SLIDER);
gtk_style_context_get_padding (context, state, &padding); gtk_style_context_get_padding (context, state, &padding);
@ -371,7 +366,6 @@ gtk_switch_get_preferred_height (GtkWidget *widget,
gint *minimum, gint *minimum,
gint *natural) gint *natural)
{ {
GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv;
GtkStyleContext *context; GtkStyleContext *context;
GtkStateFlags state; GtkStateFlags state;
GtkBorder padding; GtkBorder padding;
@ -381,14 +375,10 @@ gtk_switch_get_preferred_height (GtkWidget *widget,
gchar *str; gchar *str;
context = gtk_widget_get_style_context (widget); context = gtk_widget_get_style_context (widget);
state = gtk_widget_get_state_flags (widget); state = gtk_style_context_get_state (context);
if (priv->is_active)
state |= GTK_STATE_FLAG_ACTIVE;
gtk_style_context_save (context); gtk_style_context_save (context);
gtk_style_context_set_state (context, state);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_SLIDER); gtk_style_context_add_class (context, GTK_STYLE_CLASS_SLIDER);
gtk_style_context_get_padding (context, state, &padding); gtk_style_context_get_padding (context, state, &padding);
@ -518,17 +508,9 @@ gtk_switch_paint_handle (GtkWidget *widget,
cairo_t *cr, cairo_t *cr,
GdkRectangle *box) GdkRectangle *box)
{ {
GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv;
GtkStyleContext *context = gtk_widget_get_style_context (widget); GtkStyleContext *context = gtk_widget_get_style_context (widget);
GtkStateFlags state;
state = gtk_widget_get_state_flags (widget);
if (priv->is_active)
state |= GTK_STATE_FLAG_ACTIVE;
gtk_style_context_save (context); gtk_style_context_save (context);
gtk_style_context_set_state (context, state);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_SLIDER); gtk_style_context_add_class (context, GTK_STYLE_CLASS_SLIDER);
gtk_render_slider (context, cr, gtk_render_slider (context, cr,
@ -551,8 +533,8 @@ gtk_switch_draw (GtkWidget *widget,
const PangoFontDescription *style_desc; const PangoFontDescription *style_desc;
PangoRectangle rect; PangoRectangle rect;
gint label_x, label_y; gint label_x, label_y;
GtkStateFlags state;
GtkBorder padding; GtkBorder padding;
GtkStateFlags state;
gint focus_width, focus_pad; gint focus_width, focus_pad;
gint x, y, width, height; gint x, y, width, height;
gint font_size, style_font_size; gint font_size, style_font_size;
@ -565,12 +547,8 @@ gtk_switch_draw (GtkWidget *widget,
context = gtk_widget_get_style_context (widget); context = gtk_widget_get_style_context (widget);
state = gtk_widget_get_state_flags (widget); state = gtk_widget_get_state_flags (widget);
if (priv->is_active)
state |= GTK_STATE_FLAG_ACTIVE;
gtk_style_context_save (context); gtk_style_context_save (context);
gtk_style_context_set_state (context, state);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_SLIDER); gtk_style_context_add_class (context, GTK_STYLE_CLASS_SLIDER);
gtk_style_context_get_padding (context, state, &padding); gtk_style_context_get_padding (context, state, &padding);
@ -592,7 +570,6 @@ gtk_switch_draw (GtkWidget *widget,
gtk_style_context_save (context); gtk_style_context_save (context);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_TROUGH); gtk_style_context_add_class (context, GTK_STYLE_CLASS_TROUGH);
gtk_style_context_set_state (context, state);
gtk_render_background (context, cr, x, y, width, height); gtk_render_background (context, cr, x, y, width, height);
gtk_render_frame (context, cr, x, y, width, height); gtk_render_frame (context, cr, x, y, width, height);
@ -1069,6 +1046,11 @@ gtk_switch_set_active (GtkSwitch *sw,
NULL, GTK_STATE_ACTIVE, is_active); NULL, GTK_STATE_ACTIVE, is_active);
} }
if (priv->is_active)
gtk_widget_set_state_flags (GTK_WIDGET (sw), GTK_STATE_FLAG_ACTIVE, FALSE);
else
gtk_widget_unset_state_flags (GTK_WIDGET (sw), GTK_STATE_FLAG_ACTIVE);
gtk_widget_queue_draw (GTK_WIDGET (sw)); gtk_widget_queue_draw (GTK_WIDGET (sw));
} }
} }