[gnumeric] GUI: Fix problem with hidden sheets.



commit 6dfe81bee6bebcd62da3ae51c4da0e6e4e971866
Author: Morten Welinder <terra gnome org>
Date:   Thu Apr 22 15:09:53 2010 -0400

    GUI: Fix problem with hidden sheets.

 ChangeLog                  |    5 +++++
 NEWS                       |    1 +
 src/wbc-gtk.c              |    4 +++-
 src/widgets/ChangeLog      |    5 +++++
 src/widgets/gnm-notebook.c |    4 +++-
 5 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5398de5..3b2dd66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-22  Morten Welinder  <terra gnome org>
+
+	* src/wbc-gtk.c (wbcg_sheet_add): Set label's initial visibility.
+	Fixes #616549.
+
 2010-04-21 Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* gnumeric.doap: add e-mail address
diff --git a/NEWS b/NEWS
index 4bd59c8..f50b200 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ Morten:
 	* Make sure an empty string is shown with a quote.
 	* Fix problem loading cells with empty strings.  [#616139]
 	* Fix WEEKNUM problems.  [#616330]
+	* Fix hidden-sheet problem.  [#615549]
 
 --------------------------------------------------------------------------
 Gnumeric 1.10.2
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 502d84a..968959f 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -1291,8 +1291,10 @@ wbcg_sheet_add (WorkbookControl *wbc, SheetView *sv)
 
 	gtk_widget_show (scg->label);
 	gtk_widget_show_all (GTK_WIDGET (scg->table));
-	if (!visible)
+	if (!visible) {
 		gtk_widget_hide (GTK_WIDGET (scg->table));
+		gtk_widget_hide (GTK_WIDGET (scg->label));
+	}
 	g_object_connect (G_OBJECT (sheet),
 			  "signal::notify::visibility", cb_sheet_visibility_change, scg,
 			  "signal::notify::name", cb_sheet_tab_change, scg->label,
diff --git a/src/widgets/ChangeLog b/src/widgets/ChangeLog
index 5fe2deb..bc68962 100644
--- a/src/widgets/ChangeLog
+++ b/src/widgets/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-22  Morten Welinder  <terra gnome org>
+
+	* gnm-notebook.c (gnm_notebook_insert_tab): Set the dummy page's
+	visibility.  Fixes #616549.
+
 2010-04-16  Morten Welinder <terra gnome org>
 
 	* Release 1.10.2
diff --git a/src/widgets/gnm-notebook.c b/src/widgets/gnm-notebook.c
index 6f0112f..0f32529 100644
--- a/src/widgets/gnm-notebook.c
+++ b/src/widgets/gnm-notebook.c
@@ -8410,12 +8410,14 @@ gnm_notebook_insert_tab (GnmNotebook *nb, GtkWidget *label, int pos)
 {
 	GtkWidget *dummy_page = gtk_hbox_new (FALSE, 0);
 	gtk_widget_set_size_request (dummy_page, 1, 1);
-	gtk_widget_show (dummy_page);
+
 	g_object_set_data (G_OBJECT (label), DUMMY_KEY, dummy_page);
 
 	g_signal_connect_object (G_OBJECT (label), "destroy",
 				 G_CALLBACK (cb_label_destroyed), dummy_page,
 				 0);
+
+	cb_label_visibility (label, NULL, dummy_page);
 	g_signal_connect_object (G_OBJECT (label), "notify::visible",
 				 G_CALLBACK (cb_label_visibility), dummy_page,
 				 0);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]