[gtk+] stylecontext: Treat empty path like no path
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] stylecontext: Treat empty path like no path
- Date: Sat, 21 Nov 2015 01:23:31 +0000 (UTC)
commit 4b2ea59dd1293f658964506cc540695924cb6499
Author: Benjamin Otte <otte redhat com>
Date: Sat Nov 21 02:22:22 2015 +0100
stylecontext: Treat empty path like no path
This way, we don't do weird stuff when an empty path is set.
gtk/gtkstylecontext.c | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index d07fe1f..4a5c343 100644
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -1076,16 +1076,13 @@ gtk_style_context_set_path (GtkStyleContext *context,
root = gtk_style_context_get_root (context);
g_return_if_fail (GTK_IS_CSS_PATH_NODE (root));
- if (path)
+ if (path && gtk_widget_path_length (path) > 0)
{
GtkWidgetPath *copy = gtk_widget_path_copy (path);
gtk_css_path_node_set_widget_path (GTK_CSS_PATH_NODE (root), copy);
- if (gtk_widget_path_length (copy))
- {
- gtk_css_node_set_widget_type (root,
- gtk_widget_path_iter_get_object_type (copy, -1));
- gtk_css_node_set_name (root, gtk_widget_path_iter_get_object_name (copy, -1));
- }
+ gtk_css_node_set_widget_type (root,
+ gtk_widget_path_iter_get_object_type (copy, -1));
+ gtk_css_node_set_name (root, gtk_widget_path_iter_get_object_name (copy, -1));
gtk_widget_path_unref (copy);
}
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]