summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimm Bäder <mail@baedert.org>2018-08-19 19:04:54 +0200
committerTimm Bäder <mail@baedert.org>2018-08-25 08:06:11 +0200
commit749ef4d71ca018a18fd608bf3b2e4c022727e2ae (patch)
tree6d11c4d7a36527fb132fa8bf3fda9587a217b980
parentf6fae1dd0994ee60b83da6ded5c42b718ccf74b5 (diff)
downloadgtk+-749ef4d71ca018a18fd608bf3b2e4c022727e2ae.tar.gz
paned: Use a GtkIcon as separator
And save a few lines that way.
-rw-r--r--gtk/gtkpaned.c29
1 files changed, 4 insertions, 25 deletions
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 464110ce98..7356baff99 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -33,7 +33,7 @@
#include "gtkeventcontrollermotion.h"
#include "gtkgesturepan.h"
#include "gtkgesturesingle.h"
-#include "gtkgizmoprivate.h"
+#include "gtkiconprivate.h"
#include "gtkintl.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
@@ -1383,26 +1383,6 @@ gtk_paned_snapshot (GtkWidget *widget,
gtk_snapshot_pop (snapshot);
}
-static gboolean
-gtk_paned_render_handle (GtkGizmo *gizmo,
- GtkSnapshot *snapshot)
-{
- GtkWidget *widget = GTK_WIDGET (gizmo);
- GtkCssStyle *style = gtk_css_node_get_style (gtk_widget_get_css_node (widget));
- int width, height;
-
- width = gtk_widget_get_width (widget);
- height = gtk_widget_get_height (widget);
-
- if (width > 0 && height > 0)
- gtk_css_style_snapshot_icon (style,
- snapshot,
- width, height,
- GTK_CSS_IMAGE_BUILTIN_PANE_SEPARATOR);
-
- return FALSE;
-}
-
static void
connect_drag_gesture_signals (GtkPaned *paned,
GtkGesture *gesture)
@@ -1462,10 +1442,9 @@ gtk_paned_init (GtkPaned *paned)
g_signal_connect (controller, "motion", G_CALLBACK (gtk_paned_motion), paned);
gtk_widget_add_controller (GTK_WIDGET (paned), controller);
- priv->handle_widget = gtk_gizmo_new ("separator",
- NULL,
- NULL,
- gtk_paned_render_handle);
+ priv->handle_widget = gtk_icon_new ("separator");
+ gtk_icon_set_image (GTK_ICON (priv->handle_widget),
+ GTK_CSS_IMAGE_BUILTIN_PANE_SEPARATOR);
gtk_widget_set_parent (priv->handle_widget, GTK_WIDGET (paned));
}