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

switch: Put the slider node last

Browse Source 
Makes sense since we draw it over both labels. Also make this obvious by
using the default snapshot implementation.
This commit is contained in:
Timm Bäder 2017-06-28 15:57:42 +02:00 committed by Matthias Clasen
parent 4fb2fc7d89
commit d25af7ce10
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gtk/gtkswitch.c
View File

@ -40,9 +40,9 @@
*
* |[<!-- language="plain" -->
* switch
* ├── slider
* ├── label
* ╰── label
* ├── label
* ╰── slider
* ]|
*
* GtkSwitch has four css nodes, the main node with the name switch and subnodes
@ -369,17 +369,6 @@ gtk_switch_size_allocate (GtkWidget *widget,
gtk_widget_set_clip (widget, &clip);
}
static void
gtk_switch_snapshot (GtkWidget *widget,
GtkSnapshot *snapshot)
{
GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv;
gtk_widget_snapshot_child (widget, priv->on_label, snapshot);
gtk_widget_snapshot_child (widget, priv->off_label, snapshot);
gtk_widget_snapshot_child (widget, priv->slider, snapshot);
}
static void
gtk_switch_set_action_name (GtkActionable *actionable,
const gchar *action_name)
@ -571,7 +560,6 @@ gtk_switch_class_init (GtkSwitchClass *klass)
widget_class->measure = gtk_switch_measure;
widget_class->size_allocate = gtk_switch_size_allocate;
widget_class->snapshot = gtk_switch_snapshot;
klass->activate = gtk_switch_activate;
klass->state_set = state_set;
@ -648,9 +636,6 @@ gtk_switch_init (GtkSwitch *self)
gtk_widget_set_has_window (GTK_WIDGET (self), FALSE);
gtk_widget_set_can_focus (GTK_WIDGET (self), TRUE);
priv->slider = gtk_gizmo_new ("slider", NULL, NULL, NULL);
gtk_widget_set_parent (priv->slider, GTK_WIDGET (self));
gesture = gtk_gesture_multi_press_new (GTK_WIDGET (self));
gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (gesture), FALSE);
gtk_gesture_single_set_exclusive (GTK_GESTURE_SINGLE (gesture), TRUE);
@ -686,6 +671,9 @@ gtk_switch_init (GtkSwitch *self)
*/
priv->off_label = gtk_label_new (C_("switch", "OFF"));
gtk_widget_set_parent (priv->off_label, GTK_WIDGET (self));
priv->slider = gtk_gizmo_new ("slider", NULL, NULL, NULL);
gtk_widget_set_parent (priv->slider, GTK_WIDGET (self));
}
/**