[Monodevelop-patches-list] r1698 - in trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets: . TabLabel

[commit-watcher at mono-cvs.ximian.com]

Author: jluke
Date: 2004-06-06 17:04:45 -0400 (Sun, 06 Jun 2004)
New Revision: 1698

Modified:
   trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog
   trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/TabLabel/TabLabel.cs
Log:
fix the TabLabel resizing issues


Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog	2004-06-06 19:34:37 UTC (rev 1697)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog	2004-06-06 21:04:45 UTC (rev 1698)
@@ -1,3 +1,9 @@
+2004-06-06  John Luke  <jluke at cfl.rr.com>
+
+	* TabLabel/TabLabel.cs: fix the size of the button to 18 so it is
+	not clipped, don't allow the button to expand/fill, make the label
+	do so
+
 2004-05-09  Todd Berman  <tberman at sevenl.net>
 
 	* DragNotebook/DragNotebook.cs: notebook from Inigo Illan to add

Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/TabLabel/TabLabel.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/TabLabel/TabLabel.cs	2004-06-06 19:34:37 UTC (rev 1697)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/TabLabel/TabLabel.cs	2004-06-06 21:04:45 UTC (rev 1698)
@@ -23,20 +23,14 @@
 			this.PackStart (icon, false, true, 2);
 
 			title = label;
-			this.PackStart (title, false, true, 0);
+			this.PackStart (title, true, true, 0);
 			
 			btn = new Button ();
 			btn.Add (new Gtk.Image ("../data/resources/icons/MonoDevelop.Close.png"));
 			btn.Relief = ReliefStyle.None;
-			//btn.RequestSize = new Size (16, 16);
+			btn.SetSizeRequest (18, 18);
+			this.PackStart (btn, false, false, 2);
 
-			//FIXME: When gtk# gets unbroken uncomment the line
-			//above, and remove the two below
-			
-			btn.HeightRequest = 16;
-			btn.WidthRequest = 16;
-			this.PackStart (btn, true, true, 2);
-
 			this.ShowAll ();
 		}