[gtk+/wip/matthiasc/help-overlay] widget-factory: Limit page 2 accels to page 2
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/matthiasc/help-overlay] widget-factory: Limit page 2 accels to page 2
- Date: Wed, 21 Oct 2015 17:18:08 +0000 (UTC)
commit d828874e54601132210c8f36b2083e8e77ada823
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Oct 21 07:47:41 2015 -0400
widget-factory: Limit page 2 accels to page 2
Some of them cause nasty warnings when triggered from other pages.
demos/widget-factory/widget-factory.c | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
---
diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c
index 4f3aa53..56238b1 100644
--- a/demos/widget-factory/widget-factory.c
+++ b/demos/widget-factory/widget-factory.c
@@ -69,6 +69,13 @@ get_busy (GSimpleAction *action,
gtk_widget_set_sensitive (window, FALSE);
}
+static gint current_page = 1;
+static gboolean
+on_page (gint i)
+{
+ return current_page == i;
+}
+
static void
activate_search (GSimpleAction *action,
GVariant *parameter,
@@ -77,6 +84,9 @@ activate_search (GSimpleAction *action,
GtkWidget *window = user_data;
GtkWidget *searchbar;
+ if (!on_page (2))
+ return;
+
searchbar = GTK_WIDGET (g_object_get_data (G_OBJECT (window), "searchbar"));
gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (searchbar), TRUE);
}
@@ -89,6 +99,9 @@ activate_delete (GSimpleAction *action,
GtkWidget *window = user_data;
GtkWidget *infobar;
+ if (!on_page (2))
+ return;
+
infobar = GTK_WIDGET (g_object_get_data (G_OBJECT (window), "infobar"));
gtk_widget_show (infobar);
}
@@ -475,8 +488,13 @@ page_changed_cb (GtkWidget *stack, GParamSpec *pspec, gpointer data)
return;
name = gtk_stack_get_visible_child_name (GTK_STACK (stack));
+ if (g_str_equal (name, "page1"))
+ current_page = 1;
+ else if (g_str_equal (name, "page2"))
+ current_page = 2;
if (g_str_equal (name, "page3"))
{
+ current_page = 3;
page = gtk_stack_get_visible_child (GTK_STACK (stack));
set_needs_attention (GTK_WIDGET (page), FALSE);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]