[gtk+] popover: Don't inherit style from parent
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] popover: Don't inherit style from parent
- Date: Fri, 4 Sep 2015 17:00:01 +0000 (UTC)
commit 63cefa199aa8f0d094b1cd541265e7fab9c68f2f
Author: Benjamin Otte <otte redhat com>
Date: Thu Sep 3 15:59:57 2015 +0200
popover: Don't inherit style from parent
Instead, inherit style from toplevel (because that's the default way,
not because it makes lots of sense).
This way, popovers don't inherit the styling from the widget that popped
them up, which is a problem in selected listbox rows, selection-mode
headerbars.
It also doesn't inherit styling where we might want it, like the osd.
But we can only have one of the two things.
gtk/gtkpopover.c | 17 -----------------
1 files changed, 0 insertions(+), 17 deletions(-)
---
diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index 98fc362..86eda36 100644
--- a/gtk/gtkpopover.c
+++ b/gtk/gtkpopover.c
@@ -1665,20 +1665,6 @@ gtk_popover_class_init (GtkPopoverClass *klass)
}
static void
-_gtk_popover_update_context_parent (GtkPopover *popover)
-{
- GtkPopoverPrivate *priv = popover->priv;
- GtkStyleContext *context, *parent_context = NULL;
-
- context = gtk_widget_get_style_context (GTK_WIDGET (popover));
-
- if (priv->widget)
- parent_context = gtk_widget_get_style_context (priv->widget);
-
- gtk_style_context_set_parent (context, parent_context);
-}
-
-static void
_gtk_popover_parent_hierarchy_changed (GtkWidget *widget,
GtkWidget *previous_toplevel,
GtkPopover *popover)
@@ -1707,8 +1693,6 @@ _gtk_popover_parent_hierarchy_changed (GtkWidget *widget,
if (new_window)
gtk_popover_update_position (popover);
- _gtk_popover_update_context_parent (popover);
-
if (gtk_widget_is_visible (GTK_WIDGET (popover)))
gtk_widget_queue_resize (GTK_WIDGET (popover));
@@ -1986,7 +1970,6 @@ gtk_popover_update_relative_to (GtkPopover *popover,
}
_gtk_widget_update_parent_muxer (GTK_WIDGET (popover));
- _gtk_popover_update_context_parent (popover);
g_object_unref (popover);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]