[gtk+/wip/matthiasc/gadget] paned: Convert to gadgets
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/matthiasc/gadget] paned: Convert to gadgets
- Date: Wed, 9 Dec 2015 05:50:16 +0000 (UTC)
commit 2cd9e3b3a86cee7068a9bc672e82bd6d1d15d7c9
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Dec 9 00:17:51 2015 -0500
paned: Convert to gadgets
gtk/gtkpaned.c | 359 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 236 insertions(+), 123 deletions(-)
---
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 54f0c47..3343b8c 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -36,9 +36,10 @@
#include "gtkprivate.h"
#include "gtkintl.h"
#include "gtkwidgetprivate.h"
+#include "gtkcontainerprivate.h"
#include "a11y/gtkpanedaccessible.h"
+#include "gtkcsscustomgadgetprivate.h"
#include "gtkcssnodeprivate.h"
-#include "gtkcssstylepropertyprivate.h"
#include "gtkstylecontextprivate.h"
/**
@@ -125,7 +126,9 @@ struct _GtkPanedPrivate
GdkRectangle handle_pos;
GdkWindow *handle;
- GtkCssNode *handle_node;
+
+ GtkCssGadget *gadget;
+ GtkCssGadget *handle_gadget;
GtkGesture *pan_gesture;
@@ -785,91 +788,6 @@ pan_gesture_drag_end_cb (GtkGestureDrag *gesture,
}
static void
-node_style_changed_cb (GtkCssNode *node,
- GtkCssStyle *old_style,
- GtkCssStyle *new_style,
- GtkWidget *widget)
-{
- GtkBitmask *changes;
- static GtkBitmask *affects_size = NULL;
-
- if (G_UNLIKELY (affects_size == NULL))
- affects_size = _gtk_css_style_property_get_mask_affecting (GTK_CSS_AFFECTS_SIZE | GTK_CSS_AFFECTS_CLIP);
-
- changes = _gtk_bitmask_new ();
- changes = gtk_css_style_add_difference (changes, old_style, new_style);
-
- if (_gtk_bitmask_intersects (changes, affects_size))
- gtk_widget_queue_resize (widget);
- else
- gtk_widget_queue_draw (widget);
-
- _gtk_bitmask_free (changes);
-}
-
-static void
-gtk_paned_init (GtkPaned *paned)
-{
- GtkPanedPrivate *priv;
- GtkGesture *gesture;
- GtkCssNode *widget_node;
-
- gtk_widget_set_has_window (GTK_WIDGET (paned), FALSE);
- gtk_widget_set_can_focus (GTK_WIDGET (paned), TRUE);
-
- /* We only need to redraw when the handle position moves, which is
- * independent of the overall allocation of the GtkPaned
- */
- gtk_widget_set_redraw_on_allocate (GTK_WIDGET (paned), FALSE);
-
- paned->priv = gtk_paned_get_instance_private (paned);
- priv = paned->priv;
-
- priv->orientation = GTK_ORIENTATION_HORIZONTAL;
-
- priv->child1 = NULL;
- priv->child2 = NULL;
- priv->handle = NULL;
-
- priv->handle_pos.width = 5;
- priv->handle_pos.height = 5;
- priv->position_set = FALSE;
- priv->last_allocation = -1;
-
- priv->last_child1_focus = NULL;
- priv->last_child2_focus = NULL;
- priv->in_recursion = FALSE;
- priv->handle_prelit = FALSE;
- priv->original_position = -1;
-
- priv->handle_pos.x = -1;
- priv->handle_pos.y = -1;
-
- _gtk_orientable_set_style_classes (GTK_ORIENTABLE (paned));
-
- gesture = gtk_gesture_pan_new (GTK_WIDGET (paned),
- GTK_ORIENTATION_HORIZONTAL);
- gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (gesture), FALSE);
- g_signal_connect (gesture, "drag-begin",
- G_CALLBACK (pan_gesture_drag_begin_cb), paned);
- g_signal_connect (gesture, "pan",
- G_CALLBACK (pan_gesture_pan_cb), paned);
- g_signal_connect (gesture, "drag-end",
- G_CALLBACK (pan_gesture_drag_end_cb), paned);
- gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
- GTK_PHASE_CAPTURE);
- priv->pan_gesture = gesture;
-
- widget_node = gtk_widget_get_css_node (GTK_WIDGET (paned));
- priv->handle_node = gtk_css_node_new ();
- gtk_css_node_set_name (priv->handle_node, I_("separator"));
- gtk_css_node_set_parent (priv->handle_node, widget_node);
- gtk_css_node_set_state (priv->handle_node, gtk_css_node_get_state (widget_node));
- g_signal_connect_object (priv->handle_node, "style-changed", G_CALLBACK (node_style_changed_cb), paned, 0);
- g_object_unref (priv->handle_node);
-}
-
-static void
gtk_paned_set_property (GObject *object,
guint prop_id,
const GValue *value,
@@ -1045,6 +963,9 @@ gtk_paned_finalize (GObject *object)
g_clear_object (&paned->priv->pan_gesture);
+ g_clear_object (&paned->priv->handle_gadget);
+ g_clear_object (&paned->priv->gadget);
+
G_OBJECT_CLASS (gtk_paned_parent_class)->finalize (object);
}
@@ -1142,7 +1063,11 @@ gtk_paned_get_preferred_size_for_orientation (GtkWidget *widget,
{
gint handle_size;
- gtk_widget_style_get (widget, "handle-size", &handle_size, NULL);
+ gtk_css_gadget_get_preferred_size (priv->handle_gadget,
+ priv->orientation,
+ -1,
+ NULL, &handle_size,
+ NULL, NULL);
*minimum += handle_size;
*natural += handle_size;
@@ -1167,7 +1092,11 @@ gtk_paned_get_preferred_size_for_opposite_orientation (GtkWidget *widget,
gint child1_req, child2_req;
gint handle_size;
- gtk_widget_style_get (widget, "handle-size", &handle_size, NULL);
+ gtk_css_gadget_get_preferred_size (priv->handle_gadget,
+ OPPOSITE_ORIENTATION (priv->orientation),
+ -1,
+ NULL, &handle_size,
+ NULL, NULL);
_gtk_widget_get_preferred_size_for_size (priv->child1, priv->orientation, -1, &child1_req, NULL, NULL,
NULL);
_gtk_widget_get_preferred_size_for_size (priv->child2, priv->orientation, -1, &child2_req, NULL, NULL,
NULL);
@@ -1212,12 +1141,45 @@ gtk_paned_get_preferred_size_for_opposite_orientation (GtkWidget *widget,
}
static void
-gtk_paned_get_preferred_size (GtkWidget *widget,
- GtkOrientation orientation,
- gint size,
- gint *minimum,
- gint *natural)
-{
+gtk_paned_get_handle_size (GtkCssGadget *gadget,
+ GtkOrientation orientation,
+ gint size,
+ gint *minimum,
+ gint *natural,
+ gint *minimum_baseline,
+ gint *natural_baseline,
+ gpointer data)
+{
+ GtkWidget *widget = gtk_css_gadget_get_owner (gadget);
+ GtkPaned *paned = GTK_PANED (widget);
+ GtkPanedPrivate *priv = paned->priv;
+ GtkStyleContext *context;
+ gint handle_size;
+
+ context = gtk_widget_get_style_context (widget);
+ gtk_style_context_save_to_node (context, gtk_css_gadget_get_node (gadget));
+ gtk_widget_style_get (widget, "handle-size", &handle_size, NULL);
+ gtk_style_context_restore (context);
+
+ if (orientation == priv->orientation)
+ *minimum = *natural = handle_size;
+ else if (orientation == GTK_ORIENTATION_HORIZONTAL)
+ *minimum = *natural = gtk_widget_get_allocated_width (widget);
+ else
+ *minimum = *natural = gtk_widget_get_allocated_height(widget);
+}
+
+static void
+gtk_paned_get_size (GtkCssGadget *gadget,
+ GtkOrientation orientation,
+ gint size,
+ gint *minimum,
+ gint *natural,
+ gint *minimum_baseline,
+ gint *natural_baseline,
+ gpointer data)
+{
+ GtkWidget *widget = gtk_css_gadget_get_owner (gadget);
GtkPaned *paned = GTK_PANED (widget);
GtkPanedPrivate *priv = paned->priv;
@@ -1232,7 +1194,11 @@ gtk_paned_get_preferred_width (GtkWidget *widget,
gint *minimum,
gint *natural)
{
- gtk_paned_get_preferred_size (widget, GTK_ORIENTATION_HORIZONTAL, -1, minimum, natural);
+ gtk_css_gadget_get_preferred_size (GTK_PANED (widget)->priv->gadget,
+ GTK_ORIENTATION_HORIZONTAL,
+ -1,
+ minimum, natural,
+ NULL, NULL);
}
static void
@@ -1240,7 +1206,11 @@ gtk_paned_get_preferred_height (GtkWidget *widget,
gint *minimum,
gint *natural)
{
- gtk_paned_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, -1, minimum, natural);
+ gtk_css_gadget_get_preferred_size (GTK_PANED (widget)->priv->gadget,
+ GTK_ORIENTATION_VERTICAL,
+ -1,
+ minimum, natural,
+ NULL, NULL);
}
static void
@@ -1249,7 +1219,11 @@ gtk_paned_get_preferred_width_for_height (GtkWidget *widget,
gint *minimum,
gint *natural)
{
- gtk_paned_get_preferred_size (widget, GTK_ORIENTATION_HORIZONTAL, height, minimum, natural);
+ gtk_css_gadget_get_preferred_size (GTK_PANED (widget)->priv->gadget,
+ GTK_ORIENTATION_HORIZONTAL,
+ height,
+ minimum, natural,
+ NULL, NULL);
}
static void
@@ -1258,7 +1232,11 @@ gtk_paned_get_preferred_height_for_width (GtkWidget *widget,
gint *minimum,
gint *natural)
{
- gtk_paned_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, width, minimum, natural);
+ gtk_css_gadget_get_preferred_size (GTK_PANED (widget)->priv->gadget,
+ GTK_ORIENTATION_VERTICAL,
+ width,
+ minimum, natural,
+ NULL, NULL);
}
static void
@@ -1324,9 +1302,30 @@ gtk_paned_size_allocate (GtkWidget *widget,
{
GtkPaned *paned = GTK_PANED (widget);
GtkPanedPrivate *priv = paned->priv;
+ GtkAllocation clip;
gtk_widget_set_allocation (widget, allocation);
+ gtk_css_gadget_allocate (priv->gadget,
+ allocation,
+ gtk_widget_get_allocated_baseline (widget),
+ &clip);
+
+ gtk_widget_set_clip (widget, &clip);
+}
+
+static void
+gtk_paned_allocate (GtkCssGadget *gadget,
+ const GtkAllocation *allocation,
+ int baseline,
+ GtkAllocation *out_clip,
+ gpointer data)
+{
+ GtkWidget *widget = gtk_css_gadget_get_owner (gadget);
+ GtkPaned *paned = GTK_PANED (widget);
+ GtkPanedPrivate *priv = paned->priv;
+ GtkAllocation clip;
+
if (priv->child1 && gtk_widget_get_visible (priv->child1) &&
priv->child2 && gtk_widget_get_visible (priv->child2))
{
@@ -1336,7 +1335,11 @@ gtk_paned_size_allocate (GtkWidget *widget,
GdkRectangle old_handle_pos;
gint handle_size;
- gtk_widget_style_get (widget, "handle-size", &handle_size, NULL);
+ gtk_css_gadget_get_preferred_size (priv->handle_gadget,
+ priv->orientation,
+ -1,
+ NULL, &handle_size,
+ NULL, NULL);
old_handle_pos = priv->handle_pos;
@@ -1441,6 +1444,12 @@ gtk_paned_size_allocate (GtkWidget *widget,
child2_allocation.height = child2_height;
}
+
+ gtk_css_gadget_allocate (priv->handle_gadget,
+ &priv->handle_pos,
+ -1,
+ &clip);
+
if (gtk_widget_get_mapped (widget) &&
(old_handle_pos.x != priv->handle_pos.x ||
old_handle_pos.y != priv->handle_pos.y ||
@@ -1556,6 +1565,9 @@ gtk_paned_size_allocate (GtkWidget *widget,
gtk_paned_set_child_visible (paned, CHILD2, FALSE);
}
}
+
+ gtk_container_get_children_clip (GTK_CONTAINER (paned), out_clip);
+ gdk_rectangle_union (out_clip, &clip, out_clip);
}
static GdkWindow *
@@ -1732,15 +1744,24 @@ static gboolean
gtk_paned_draw (GtkWidget *widget,
cairo_t *cr)
{
+ gtk_css_gadget_draw (GTK_PANED (widget)->priv->gadget, cr);
+
+ return FALSE;
+}
+
+static gboolean
+gtk_paned_render (GtkCssGadget *gadget,
+ cairo_t *cr,
+ int x,
+ int y,
+ int width,
+ int height,
+ gpointer data)
+{
+ GtkWidget *widget = gtk_css_gadget_get_owner (gadget);
GtkPaned *paned = GTK_PANED (widget);
GtkPanedPrivate *priv = paned->priv;
GtkStyleContext *context = gtk_widget_get_style_context (widget);
- GtkAllocation allocation;
-
- gtk_widget_get_allocation (widget, &allocation);
- gtk_render_background (context, cr,
- 0, 0,
- allocation.width, allocation.height);
if (gtk_cairo_should_draw_window (cr, priv->child1_window))
{
@@ -1770,21 +1791,109 @@ gtk_paned_draw (GtkWidget *widget,
priv->child1 && gtk_widget_get_visible (priv->child1) &&
priv->child2 && gtk_widget_get_visible (priv->child2))
{
- gtk_style_context_save_to_node (context, priv->handle_node);
- gtk_render_handle (context, cr,
- priv->handle_pos.x - allocation.x,
- priv->handle_pos.y - allocation.y,
- priv->handle_pos.width,
- priv->handle_pos.height);
- gtk_style_context_restore (context);
+ gtk_css_gadget_draw (priv->handle_gadget, cr);
}
/* Chain up to draw children */
GTK_WIDGET_CLASS (gtk_paned_parent_class)->draw (widget, cr);
-
+
+ return FALSE;
+}
+
+static gboolean
+gtk_paned_render_handle (GtkCssGadget *gadget,
+ cairo_t *cr,
+ int x,
+ int y,
+ int width,
+ int height,
+ gpointer data)
+{
+ GtkWidget *widget = gtk_css_gadget_get_owner (gadget);
+ GtkPaned *paned = GTK_PANED (widget);
+ GtkPanedPrivate *priv = paned->priv;
+ GtkStyleContext *context = gtk_widget_get_style_context (widget);
+
+ gtk_style_context_save_to_node (context, gtk_css_gadget_get_node (priv->handle_gadget));
+ gtk_render_handle (context, cr, x, y, width, height);
+ gtk_style_context_restore (context);
+
return FALSE;
}
+static void
+gtk_paned_init (GtkPaned *paned)
+{
+ GtkPanedPrivate *priv;
+ GtkGesture *gesture;
+ GtkCssNode *widget_node;
+
+ gtk_widget_set_has_window (GTK_WIDGET (paned), FALSE);
+ gtk_widget_set_can_focus (GTK_WIDGET (paned), TRUE);
+
+ /* We only need to redraw when the handle position moves, which is
+ * independent of the overall allocation of the GtkPaned
+ */
+ gtk_widget_set_redraw_on_allocate (GTK_WIDGET (paned), FALSE);
+
+ paned->priv = gtk_paned_get_instance_private (paned);
+ priv = paned->priv;
+
+ priv->orientation = GTK_ORIENTATION_HORIZONTAL;
+
+ priv->child1 = NULL;
+ priv->child2 = NULL;
+ priv->handle = NULL;
+
+ priv->handle_pos.width = 5;
+ priv->handle_pos.height = 5;
+ priv->position_set = FALSE;
+ priv->last_allocation = -1;
+
+ priv->last_child1_focus = NULL;
+ priv->last_child2_focus = NULL;
+ priv->in_recursion = FALSE;
+ priv->handle_prelit = FALSE;
+ priv->original_position = -1;
+
+ priv->handle_pos.x = -1;
+ priv->handle_pos.y = -1;
+
+ _gtk_orientable_set_style_classes (GTK_ORIENTABLE (paned));
+
+ gesture = gtk_gesture_pan_new (GTK_WIDGET (paned),
+ GTK_ORIENTATION_HORIZONTAL);
+ gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (gesture), FALSE);
+ g_signal_connect (gesture, "drag-begin",
+ G_CALLBACK (pan_gesture_drag_begin_cb), paned);
+ g_signal_connect (gesture, "pan",
+ G_CALLBACK (pan_gesture_pan_cb), paned);
+ g_signal_connect (gesture, "drag-end",
+ G_CALLBACK (pan_gesture_drag_end_cb), paned);
+ gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
+ GTK_PHASE_CAPTURE);
+ priv->pan_gesture = gesture;
+
+ widget_node = gtk_widget_get_css_node (GTK_WIDGET (paned));
+ priv->gadget = gtk_css_custom_gadget_new_for_node (widget_node,
+ GTK_WIDGET (paned),
+ gtk_paned_get_size,
+ gtk_paned_allocate,
+ gtk_paned_render,
+ NULL,
+ NULL);
+ priv->handle_gadget = gtk_css_custom_gadget_new ("separator",
+ GTK_WIDGET (paned),
+ priv->gadget,
+ NULL,
+ gtk_paned_get_handle_size,
+ NULL,
+ gtk_paned_render_handle,
+ NULL,
+ NULL);
+ gtk_css_node_set_state (gtk_css_gadget_get_node (priv->handle_gadget), gtk_css_node_get_state
(widget_node));
+}
+
static gboolean
is_rtl (GtkPaned *paned)
{
@@ -1823,9 +1932,11 @@ update_drag (GtkPaned *paned,
if (is_rtl (paned))
{
- gtk_widget_style_get (widget,
- "handle-size", &handle_size,
- NULL);
+ gtk_css_gadget_get_preferred_size (priv->handle_gadget,
+ GTK_ORIENTATION_HORIZONTAL,
+ -1,
+ NULL, &handle_size,
+ NULL, NULL);
size = allocation.width - pos - handle_size;
}
@@ -1854,7 +1965,7 @@ update_node_state (GtkWidget *widget)
if (priv->handle_prelit)
state |= GTK_STATE_FLAG_PRELIGHT;
- gtk_css_node_set_state (priv->handle_node, state);
+ gtk_css_node_set_state (gtk_css_gadget_get_node (priv->handle_gadget), state);
}
static gboolean
@@ -1941,6 +2052,8 @@ gtk_paned_state_flags_changed (GtkWidget *widget,
}
update_node_state (widget);
+
+ GTK_WIDGET_CLASS (gtk_paned_parent_class)->state_flags_changed (widget, previous_state);
}
/**
@@ -2025,7 +2138,7 @@ gtk_paned_pack1 (GtkPaned *paned,
widget_node = gtk_widget_get_css_node (GTK_WIDGET (paned));
child_node = gtk_widget_get_css_node (child);
- gtk_css_node_insert_before (widget_node, child_node, priv->handle_node);
+ gtk_css_node_insert_before (widget_node, child_node, gtk_css_gadget_get_node (priv->handle_gadget));
gtk_widget_set_parent_window (child, priv->child1_window);
gtk_widget_set_parent (child, GTK_WIDGET (paned));
@@ -2064,7 +2177,7 @@ gtk_paned_pack2 (GtkPaned *paned,
widget_node = gtk_widget_get_css_node (GTK_WIDGET (paned));
child_node = gtk_widget_get_css_node (child);
- gtk_css_node_insert_after (widget_node, child_node, priv->handle_node);
+ gtk_css_node_insert_after (widget_node, child_node, gtk_css_gadget_get_node (priv->handle_gadget));
gtk_widget_set_parent_window (child, priv->child2_window);
gtk_widget_set_parent (child, GTK_WIDGET (paned));
@@ -2945,9 +3058,9 @@ gtk_paned_set_wide_handle (GtkPaned *paned,
if (old_wide != wide)
{
if (wide)
- gtk_css_node_add_class (paned->priv->handle_node, g_quark_from_static_string (GTK_STYLE_CLASS_WIDE));
+ gtk_css_gadget_add_class (paned->priv->handle_gadget, GTK_STYLE_CLASS_WIDE);
else
- gtk_css_node_remove_class (paned->priv->handle_node, g_quark_from_static_string
(GTK_STYLE_CLASS_WIDE));
+ gtk_css_gadget_remove_class (paned->priv->handle_gadget, GTK_STYLE_CLASS_WIDE);
gtk_widget_queue_resize (GTK_WIDGET (paned));
g_object_notify (G_OBJECT (paned), "wide-handle");
@@ -2969,7 +3082,7 @@ gtk_paned_get_wide_handle (GtkPaned *paned)
{
g_return_val_if_fail (GTK_IS_PANED (paned), FALSE);
- if (gtk_css_node_has_class (paned->priv->handle_node, g_quark_from_static_string (GTK_STYLE_CLASS_WIDE)))
+ if (gtk_css_node_has_class (gtk_css_gadget_get_node (paned->priv->handle_gadget),
g_quark_from_static_string (GTK_STYLE_CLASS_WIDE)))
return TRUE;
else
return FALSE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
