[gtk+/wip/cssnode3: 81/81] switch: Port to GtkCssNode
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/cssnode3: 81/81] switch: Port to GtkCssNode
- Date: Sat, 28 Feb 2015 23:16:32 +0000 (UTC)
commit 098de080b5f46c5489c6af778cb39b4b217eff9d
Author: Benjamin Otte <otte redhat com>
Date: Mon Feb 16 23:05:05 2015 +0100
switch: Port to GtkCssNode
This is a simple port, no code modifications so far other than replacing
gtk_style_context_save() with gtk_style_context_save_to_node().
gtk/gtkcssnode.c | 6 ++++++
gtk/gtkcssnodeprivate.h | 2 ++
gtk/gtkswitch.c | 45 +++++++++++++++++++++++++++------------------
3 files changed, 35 insertions(+), 18 deletions(-)
---
diff --git a/gtk/gtkcssnode.c b/gtk/gtkcssnode.c
index 39ddd7c..4e970fe 100644
--- a/gtk/gtkcssnode.c
+++ b/gtk/gtkcssnode.c
@@ -362,6 +362,12 @@ gtk_css_node_init (GtkCssNode *cssnode)
cssnode->visible = TRUE;
}
+GtkCssNode *
+gtk_css_node_new (void)
+{
+ return g_object_new (GTK_TYPE_CSS_NODE, NULL);
+}
+
static GdkFrameClock *
gtk_css_node_get_frame_clock_or_null (GtkCssNode *cssnode)
{
diff --git a/gtk/gtkcssnodeprivate.h b/gtk/gtkcssnodeprivate.h
index 00a106a..8010a11 100644
--- a/gtk/gtkcssnodeprivate.h
+++ b/gtk/gtkcssnodeprivate.h
@@ -84,6 +84,8 @@ struct _GtkCssNodeClass
GType gtk_css_node_get_type (void) G_GNUC_CONST;
+GtkCssNode * gtk_css_node_new (void);
+
void gtk_css_node_set_parent (GtkCssNode *cssnode,
GtkCssNode *parent);
void gtk_css_node_set_after (GtkCssNode *cssnode,
diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c
index 1f5692c..ff289a9 100644
--- a/gtk/gtkswitch.c
+++ b/gtk/gtkswitch.c
@@ -42,15 +42,17 @@
#include "gtkswitch.h"
#include "deprecated/gtkactivatable.h"
+#include "deprecated/gtktoggleaction.h"
#include "gtkintl.h"
#include "gtkprivate.h"
-#include "deprecated/gtktoggleaction.h"
#include "gtkwidget.h"
#include "gtkmarshalers.h"
#include "gtkapplicationprivate.h"
#include "gtkactionable.h"
#include "a11y/gtkswitchaccessible.h"
#include "gtkactionhelper.h"
+#include "gtkcssnodeprivate.h"
+#include "gtkstylecontextprivate.h"
#include "gtkwidgetprivate.h"
#include <math.h>
@@ -66,6 +68,8 @@ struct _GtkSwitchPrivate
GtkGesture *pan_gesture;
GtkGesture *multipress_gesture;
+ GtkCssNode *slider_node;
+
double handle_pos;
gint64 start_time;
gint64 end_time;
@@ -254,9 +258,7 @@ gtk_switch_pan_gesture_pan (GtkGesturePan *gesture,
context = gtk_widget_get_style_context (widget);
state = gtk_widget_get_state_flags (widget);
- gtk_style_context_save (context);
- gtk_style_context_remove_class (context, GTK_STYLE_CLASS_TROUGH);
- gtk_style_context_add_class (context, GTK_STYLE_CLASS_SLIDER);
+ gtk_style_context_save_to_node (context, priv->slider_node);
gtk_style_context_get_padding (context, state, &padding);
gtk_style_context_restore (context);
@@ -348,6 +350,8 @@ gtk_switch_get_preferred_width (GtkWidget *widget,
gint *minimum,
gint *natural)
{
+ GtkSwitch *self;
+ GtkSwitchPrivate *priv;
GtkStyleContext *context;
GtkStateFlags state;
GtkBorder padding;
@@ -355,13 +359,12 @@ gtk_switch_get_preferred_width (GtkWidget *widget,
PangoLayout *layout;
PangoRectangle logical_rect;
+ self = GTK_SWITCH (widget);
+ priv = self->priv;
context = gtk_widget_get_style_context (widget);
state = gtk_style_context_get_state (context);
- gtk_style_context_save (context);
-
- gtk_style_context_remove_class (context, GTK_STYLE_CLASS_TROUGH);
- gtk_style_context_add_class (context, GTK_STYLE_CLASS_SLIDER);
+ gtk_style_context_save_to_node (context, priv->slider_node);
gtk_style_context_get_padding (context, state, &padding);
width = padding.left + padding.right;
@@ -400,6 +403,8 @@ gtk_switch_get_preferred_height (GtkWidget *widget,
gint *minimum,
gint *natural)
{
+ GtkSwitch *self;
+ GtkSwitchPrivate *priv;
GtkStyleContext *context;
GtkStateFlags state;
GtkBorder padding;
@@ -408,13 +413,13 @@ gtk_switch_get_preferred_height (GtkWidget *widget,
PangoRectangle logical_rect;
gchar *str;
+ self = GTK_SWITCH (widget);
+ priv = self->priv;
context = gtk_widget_get_style_context (widget);
state = gtk_style_context_get_state (context);
- gtk_style_context_save (context);
+ gtk_style_context_save_to_node (context, priv->slider_node);
- gtk_style_context_remove_class (context, GTK_STYLE_CLASS_TROUGH);
- gtk_style_context_add_class (context, GTK_STYLE_CLASS_SLIDER);
gtk_style_context_get_padding (context, state, &padding);
height = padding.top + padding.bottom;
@@ -543,9 +548,7 @@ gtk_switch_paint_handle (GtkWidget *widget,
{
GtkStyleContext *context = gtk_widget_get_style_context (widget);
- gtk_style_context_save (context);
- gtk_style_context_remove_class (context, GTK_STYLE_CLASS_TROUGH);
- gtk_style_context_add_class (context, GTK_STYLE_CLASS_SLIDER);
+ gtk_style_context_save_to_node (context, GTK_SWITCH (widget)->priv->slider_node);
gtk_render_slider (context, cr,
box->x, box->y,
@@ -572,10 +575,7 @@ gtk_switch_draw (GtkWidget *widget,
context = gtk_widget_get_style_context (widget);
state = gtk_widget_get_state_flags (widget);
- gtk_style_context_save (context);
-
- gtk_style_context_remove_class (context, GTK_STYLE_CLASS_TROUGH);
- gtk_style_context_add_class (context, GTK_STYLE_CLASS_SLIDER);
+ gtk_style_context_save_to_node (context, priv->slider_node);
gtk_style_context_get_padding (context, state, &padding);
@@ -995,6 +995,7 @@ gtk_switch_init (GtkSwitch *self)
GtkSwitchPrivate *priv;
GtkStyleContext *context;
GtkGesture *gesture;
+ GtkCssNode *widget_node;
priv = self->priv = gtk_switch_get_instance_private (self);
@@ -1002,6 +1003,14 @@ gtk_switch_init (GtkSwitch *self)
gtk_widget_set_has_window (GTK_WIDGET (self), FALSE);
gtk_widget_set_can_focus (GTK_WIDGET (self), TRUE);
+ widget_node = gtk_widget_get_css_node (GTK_WIDGET (self));
+ priv->slider_node = gtk_css_node_new ();
+ gtk_css_node_set_widget_type (priv->slider_node, GTK_TYPE_SWITCH);
+ gtk_css_node_add_class (priv->slider_node, g_quark_from_string (GTK_STYLE_CLASS_SLIDER));
+ gtk_css_node_set_parent (priv->slider_node, widget_node);
+ gtk_css_node_set_state (priv->slider_node, gtk_css_node_get_state (widget_node));
+ g_object_unref (priv->slider_node);
+
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);
[
Date Prev][
Date Next] [
Thread Prev][Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]