gnome-scan r752 - in trunk: . lib

[bersace svn gnome org]

Author: bersace
Date: Thu Dec 25 21:36:38 2008
New Revision: 752
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=752&view=rev

Log:
Handle no_show_all widget.

Modified:
   trunk/ChangeLog
   trunk/lib/gnome-scan-option-box.vala

Modified: trunk/lib/gnome-scan-option-box.vala
==============================================================================
--- trunk/lib/gnome-scan-option-box.vala	(original)
+++ trunk/lib/gnome-scan-option-box.vala	Thu Dec 25 21:36:38 2008
@@ -69,10 +69,6 @@
 			widget.show += this.on_option_widget_visibility_changed;
 
 			this.child_count++;
-			// consider option visible to hide it after attach
-			if (!option.active)
-				this.child_visible_count++;
-
 			// compute attach option
 			var opts = AttachOptions.FILL;
 			if (widget.expand) {
@@ -90,6 +86,7 @@
 				Label label = new Label(_("%s:").printf(option.title));
 				label.tooltip_text = option.desc;
 				label.set_alignment((float)0, (float)0.5);
+				label.no_show_all = widget.no_show_all;
 				this.labels.insert(widget, label);
 				this.table.attach(label, 0, 1, this.child_count-1, this.child_count,
 								  AttachOptions.FILL, AttachOptions.FILL, 0, 0);
@@ -98,6 +95,11 @@
 			}
 
 			this.children.insert(option, widget);
+
+			// consider option visible to hide it after attach
+			if (!option.active)
+				this.child_visible_count++;
+
 			this.on_option_widget_visibility_changed(widget);
 		}
 
@@ -128,6 +130,10 @@
 
 		private void on_option_widget_visibility_changed(OptionWidget widget)
 		{
+			// ignore no_show_all widget.
+			if (widget.no_show_all)
+				return;
+
 			var label = this.labels.lookup(widget);
 			if (label != null) {
 				label.no_show_all = widget.no_show_all;