[gtk/wip/baedert/for-master: 3/7] scrolledwindwo: Add a permanent junction node
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/baedert/for-master: 3/7] scrolledwindwo: Add a permanent junction node
- Date: Sun, 10 May 2020 07:32:32 +0000 (UTC)
commit 6566fdc1e32a9a59c9d5b6563fce09cfde9876be
Author: Timm Bäder <mail baedert org>
Date: Thu May 7 09:07:43 2020 +0200
scrolledwindwo: Add a permanent junction node
Use that instead of save_named'ing a junction node.
gtk/gtkscrolledwindow.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 24bdd5a063..6f6af32a83 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -246,6 +246,7 @@ typedef struct
GtkCssNode *overshoot_node[4];
GtkCssNode *undershoot_node[4];
+ GtkCssNode *junction_node;
Indicator hindicator;
Indicator vindicator;
@@ -1839,7 +1840,7 @@ gtk_scrolled_window_snapshot_scrollbars_junction (GtkScrolledWindow *scrolled_wi
junction_rect.height = hscr_allocation.height;
context = gtk_widget_get_style_context (widget);
- gtk_style_context_save_named (context, "junction");
+ gtk_style_context_save_to_node (context, priv->junction_node);
gtk_snapshot_render_background (snapshot, context,
junction_rect.x, junction_rect.y,
@@ -2050,6 +2051,12 @@ gtk_scrolled_window_init (GtkScrolledWindow *scrolled_window)
gtk_scrolled_window_update_use_indicators (scrolled_window);
+ priv->junction_node = gtk_css_node_new ();
+ gtk_css_node_set_name (priv->junction_node, g_quark_from_static_string ("junction"));
+ gtk_css_node_set_parent (priv->junction_node, widget_node);
+ gtk_css_node_set_state (priv->junction_node, gtk_css_node_get_state (widget_node));
+ g_object_unref (priv->junction_node);
+
controller = gtk_event_controller_scroll_new (GTK_EVENT_CONTROLLER_SCROLL_BOTH_AXES |
GTK_EVENT_CONTROLLER_SCROLL_KINETIC);
g_signal_connect (controller, "scroll-begin",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]