[gtk+/wip/otte/gadget: 15/30] notebook: Set prelight state properly
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/otte/gadget: 15/30] notebook: Set prelight state properly
- Date: Sun, 11 Oct 2015 18:19:42 +0000 (UTC)
commit 1583d074c4412f5b52b65fc4da9629c748bfc5a5
Author: Benjamin Otte <otte redhat com>
Date: Mon Sep 7 02:15:25 2015 +0200
notebook: Set prelight state properly
Don't update it on save/restore, actually set it when it changes.
gtk/gtknotebook.c | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 5cb4435..5be9136 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -2035,8 +2035,6 @@ notebook_save_context_for_tab (GtkNotebook *notebook,
{
if (page == notebook->priv->cur_page)
state |= GTK_STATE_FLAG_ACTIVE;
- if (page == notebook->priv->prelight_tab)
- state |= GTK_STATE_FLAG_PRELIGHT;
if (page->reorderable)
gtk_style_context_add_class (context, "reorderable-page");
}
@@ -3282,13 +3280,23 @@ update_prelight_tab (GtkNotebook *notebook,
if (priv->prelight_tab == page)
return;
- if (priv->prelight_tab && priv->prelight_tab->tab_label)
- gtk_style_context_remove_class (gtk_widget_get_style_context (priv->prelight_tab->tab_label),
- "prelight-page");
+ if (priv->prelight_tab)
+ {
+ gtk_css_node_set_state (priv->prelight_tab->cssnode,
+ gtk_css_node_get_state (priv->prelight_tab->cssnode) &
~GTK_STATE_FLAG_PRELIGHT);
+ if (priv->prelight_tab->tab_label)
+ gtk_style_context_remove_class (gtk_widget_get_style_context (priv->prelight_tab->tab_label),
+ "prelight-page");
+ }
- if (page && page->tab_label)
- gtk_style_context_add_class (gtk_widget_get_style_context (page->tab_label),
- "prelight-page");
+ if (page)
+ {
+ gtk_css_node_set_state (page->cssnode,
+ gtk_css_node_get_state (page->cssnode) | GTK_STATE_FLAG_PRELIGHT);
+ if (page->tab_label)
+ gtk_style_context_add_class (gtk_widget_get_style_context (page->tab_label),
+ "prelight-page");
+ }
priv->prelight_tab = page;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]