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

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

Author: tberman
Date: 2004-06-08 18:11:10 -0400 (Tue, 08 Jun 2004)
New Revision: 1717

Modified:
   trunk/MonoDevelop/src/Libraries/Gdl/Dock.cs
   trunk/MonoDevelop/src/Libraries/Gdl/DockItemGrip.cs
   trunk/MonoDevelop/src/Libraries/Gdl/DockMaster.cs
Log:
still not working, but less errors, etc


Modified: trunk/MonoDevelop/src/Libraries/Gdl/Dock.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/Dock.cs	2004-06-08 21:11:09 UTC (rev 1716)
+++ trunk/MonoDevelop/src/Libraries/Gdl/Dock.cs	2004-06-08 22:11:10 UTC (rev 1717)
@@ -11,7 +11,15 @@
 	
 		public Dock ()
 		{
+			this.Flags |= (int)Gtk.WidgetFlags.NoWindow;
 			this.DockObjectFlags &= ~(DockObjectFlags.Automatic);
+			if (this.Master == null) {
+				this.Bind (new DockMaster ());
+			}
+			if (this.floating) {
+				//Need code here to handle floating shit.
+			}
+			this.DockObjectFlags |= DockObjectFlags.Attached;
 		}
 		
 		public Dock (Dock original, bool _floating) : this ()
@@ -92,7 +100,7 @@
 		{
 			int border_width = (int)this.BorderWidth;
 			if (this.root != null && this.root.Visible)
-				this.root.SetSizeRequest (requisition.Width, requisition.Height);
+				requisition = this.root.SizeRequest ();
 			else {
 				requisition.Width = 0;
 				requisition.Height = 0;
@@ -139,13 +147,14 @@
 			base.OnShown ();
 			if (this.floating && this.window != null)
 				this.window.Show ();
-			/*PORT:
-			    if (GDL_DOCK_IS_CONTROLLER (dock)) {
-        gdl_dock_master_foreach_toplevel (GDL_DOCK_OBJECT_GET_MASTER (dock),
-                                          FALSE, (GFunc) gdl_dock_foreach_automatic,
-                                          gtk_widget_show);
-    			}
-			*/
+			if (this.IsController) {
+				foreach (DockObject item in this.Master.TopLevelDocks) {
+					if (item == this)
+						continue;
+					Console.WriteLine ("Showing: " + item.Name);
+					item.Show ();
+				}
+			}
 		}
 		
 		protected override void OnHidden ()
@@ -428,6 +437,12 @@
 		
 		private bool IsController {
 			get {
+				if (this.Master == null) {
+					Console.WriteLine ("Master is null");
+					return false;
+				}
+				if (this.Master.Controller == null)
+					Console.WriteLine ("Master.Controller is null");
 				return (this.Master.Controller == this); 
 			}
 		}

Modified: trunk/MonoDevelop/src/Libraries/Gdl/DockItemGrip.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/DockItemGrip.cs	2004-06-08 21:11:09 UTC (rev 1716)
+++ trunk/MonoDevelop/src/Libraries/Gdl/DockItemGrip.cs	2004-06-08 22:11:10 UTC (rev 1717)
@@ -352,7 +352,5 @@
 				invoker.Invoke (this.iconify_button);
 			}
 		}
-		
-		
 	}
 }
\ No newline at end of file

Modified: trunk/MonoDevelop/src/Libraries/Gdl/DockMaster.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/DockMaster.cs	2004-06-08 21:11:09 UTC (rev 1716)
+++ trunk/MonoDevelop/src/Libraries/Gdl/DockMaster.cs	2004-06-08 22:11:10 UTC (rev 1717)
@@ -27,7 +27,7 @@
 			get { return default_title; }
 			set { default_title = value; }
 		}
-		
+				
 		public int Locked {
 			get {
 				if (unlocked_items.Count == 0)
@@ -42,6 +42,10 @@
 			}
 		}
 		
+		public ArrayList TopLevelDocks {
+			get { return toplevel_docks; }
+		}
+		
 		protected void foreach_lock_unlock (DockItem item, bool locked)
 		{
 			item.Locked = locked;