[Monodevelop-patches-list] r1720 - trunk/MonoDevelop/src/Libraries/Gdl

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

Author: tberman
Date: 2004-06-08 21:13:19 -0400 (Tue, 08 Jun 2004)
New Revision: 1720

Modified:
   trunk/MonoDevelop/src/Libraries/Gdl/DockItem.cs
   trunk/MonoDevelop/src/Libraries/Gdl/DockItemGrip.cs
Log:
random stuff, i think something really ugly is going on with the size requisition/allocation, and im going to have to get jeroen to look at it when i see him next.


Modified: trunk/MonoDevelop/src/Libraries/Gdl/DockItem.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/DockItem.cs	2004-06-08 23:24:08 UTC (rev 1719)
+++ trunk/MonoDevelop/src/Libraries/Gdl/DockItem.cs	2004-06-09 01:13:19 UTC (rev 1720)
@@ -272,6 +272,7 @@
 		protected override void OnSizeAllocated (Gdk.Rectangle allocation)
 		{
 			this.Allocation = allocation;
+			
 			if (this.IsRealized) {
 				this.GdkWindow.MoveResize (allocation.X, allocation.Y, allocation.Width, allocation.Height);
 			}
@@ -283,18 +284,17 @@
 				child_allocation.Width = allocation.Width - 2 * (border_width + this.Style.XThickness);
 				child_allocation.Height = allocation.Height - 2 * (border_width + this.Style.YThickness);
 				
-				Console.WriteLine (this.GripShown);
 				if (this.GripShown) {
 					Gdk.Rectangle grip_alloc = child_allocation;
 					Gtk.Requisition grip_req = this.grip.SizeRequest ();
 					if (this.Orientation == Gtk.Orientation.Horizontal) {
 						child_allocation.X += grip_req.Width;
 						child_allocation.Width -= grip_req.Width;
-						grip_alloc.Width = grip_req.Width;
+						//grip_alloc.Width = grip_req.Width;
 					} else {
 						child_allocation.Y += grip_req.Height;
 						child_allocation.Height -= grip_req.Height;
-						grip_alloc.Height = grip_req.Height;
+						//grip_alloc.Height = grip_req.Height;
 					}
 					if (this.grip != null) {
 						this.grip.SizeAllocate (grip_alloc);

Modified: trunk/MonoDevelop/src/Libraries/Gdl/DockItemGrip.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/DockItemGrip.cs	2004-06-08 23:24:08 UTC (rev 1719)
+++ trunk/MonoDevelop/src/Libraries/Gdl/DockItemGrip.cs	2004-06-09 01:13:19 UTC (rev 1720)
@@ -22,12 +22,12 @@
 		public DockItemGrip ()
 		{
 			this.Flags |= (int)Gtk.WidgetFlags.NoWindow;
-		
+			
 			Widget.PushCompositeChild ();
 			this.close_button = new Gtk.Button ();
 			Widget.PopCompositeChild ();
 			
-			this.close_button.Flags |= (int)Gtk.WidgetFlags.CanFocus;
+			this.close_button.Flags &= ~(int)Gtk.WidgetFlags.CanFocus;
 			this.close_button.Parent = this;
 			this.close_button.Relief = Gtk.ReliefStyle.None;
 			this.close_button.Show ();
@@ -42,7 +42,7 @@
 			this.iconify_button = new Gtk.Button ();
 			Widget.PopCompositeChild ();
 			
-			this.iconify_button.Flags |= (int)Gtk.WidgetFlags.CanFocus;
+			this.iconify_button.Flags &= ~(int)(Gtk.WidgetFlags.CanFocus);
 			this.iconify_button.Parent = this;
 			this.iconify_button.Relief = Gtk.ReliefStyle.None;
 			this.iconify_button.Show ();
@@ -218,7 +218,6 @@
 		protected override void OnMapped ()
 		{
 			base.OnMapped ();
-			Console.WriteLine ("Mapping the grip");
 			if (this.title_window != null) {
 				this.title_window.Show ();
 			}
@@ -333,9 +332,6 @@
 					area.Width -= this.icon_pixbuf.Width + 1;
 				}
 				this.EllipsizeLayout (area.Width);
-				Console.WriteLine ("Text: |" + this.title_layout.Text + "|");
-			} else {
-				Console.WriteLine ("title_window was null");
 			}
 		}