[Monodevelop-patches-list] r1724 - trunk/MonoDevelop/src/Libraries/Gdl
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Wed Jun 9 14:30:01 EDT 2004
Author: tberman
Date: 2004-06-09 14:30:01 -0400 (Wed, 09 Jun 2004)
New Revision: 1724
Modified:
trunk/MonoDevelop/src/Libraries/Gdl/DockItem.cs
trunk/MonoDevelop/src/Libraries/Gdl/DockPaned.cs
trunk/MonoDevelop/src/Libraries/Gdl/Gdl.prjx
trunk/MonoDevelop/src/Libraries/Gdl/GdlDockTest.cs
Log:
some changes, etc, more things working, gotta start on the DnD soon
Modified: trunk/MonoDevelop/src/Libraries/Gdl/DockItem.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/DockItem.cs 2004-06-09 07:12:53 UTC (rev 1723)
+++ trunk/MonoDevelop/src/Libraries/Gdl/DockItem.cs 2004-06-09 18:30:01 UTC (rev 1724)
@@ -473,6 +473,7 @@
public override bool DockRequest (int x, int y, DockRequest request)
{
+ Console.WriteLine ("Inside DockItem.DockRequest");
Gdk.Rectangle alloc = this.Allocation;
int rel_x = x - alloc.X;
int rel_y = y - alloc.Y;
@@ -570,8 +571,10 @@
return;
}
- if (this.ParentObject != null)
- this.ParentObject.Freeze ();
+ Console.WriteLine ("new_parent is of type: " + new_parent);
+
+ if (parentObj != null)
+ parentObj.Freeze ();
this.DockObjectFlags |= DockObjectFlags.InReflow;
this.Detach (false);
new_parent.Freeze ();
@@ -579,10 +582,14 @@
Console.WriteLine ("About to add");
if (add_ourselves_first) {
+ Console.WriteLine ("Adding this");
new_parent.Add (this);
+ Console.WriteLine ("Adding new object");
new_parent.Add (requestor);
} else {
+ Console.WriteLine ("Adding new object");
new_parent.Add (requestor);
+ Console.WriteLine ("Adding this");
new_parent.Add (this);
}
Console.WriteLine ("Done Adding");
@@ -603,8 +610,8 @@
this.DockObjectFlags &= ~(DockObjectFlags.InReflow);
new_parent.Thaw ();
- if (this.ParentObject != null)
- this.ParentObject.Thaw ();
+ if (parentObj != null)
+ parentObj.Thaw ();
}
private void DetachMenu (Gtk.Widget item, Gtk.Menu menu)
Modified: trunk/MonoDevelop/src/Libraries/Gdl/DockPaned.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/DockPaned.cs 2004-06-09 07:12:53 UTC (rev 1723)
+++ trunk/MonoDevelop/src/Libraries/Gdl/DockPaned.cs 2004-06-09 18:30:01 UTC (rev 1724)
@@ -47,7 +47,6 @@
this.Child = new Gtk.VPaned ();
//Signal connects?
-
this.Child.Parent = this;
this.Child.Show ();
}
@@ -58,15 +57,16 @@
if (item == null)
return;
Gtk.Paned paned = (Gtk.Paned)this.Child;
- if (paned.Child1 != null && paned.Child2 != null)
+ if (paned.Child1 != null && paned.Child2 != null) {
return;
+ }
DockPlacement pos = DockPlacement.None;
if (paned.Child1 == null)
- pos = item.Orientation == Gtk.Orientation.Horizontal ? DockPlacement.Left : DockPlacement.Top;
+ pos = (this.Orientation == Gtk.Orientation.Horizontal ? DockPlacement.Left : DockPlacement.Top);
else
- pos = item.Orientation == Gtk.Orientation.Vertical ? DockPlacement.Right : DockPlacement.Bottom;
+ pos = (this.Orientation == Gtk.Orientation.Horizontal ? DockPlacement.Right : DockPlacement.Bottom);
if (pos != DockPlacement.None)
this.Docking (item, pos, null);
@@ -132,4 +132,4 @@
}
}
}
-}
\ No newline at end of file
+}
Modified: trunk/MonoDevelop/src/Libraries/Gdl/Gdl.prjx
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/Gdl.prjx 2004-06-09 07:12:53 UTC (rev 1723)
+++ trunk/MonoDevelop/src/Libraries/Gdl/Gdl.prjx 2004-06-09 18:30:01 UTC (rev 1724)
@@ -1,4 +1,4 @@
-<Project name="Gdl" description="" newfilesearch="OnLoad" enableviewstate="True" version="1.1" projecttype="C#">
+<Project name="Gdl" description="" newfilesearch="None" enableviewstate="True" version="1.1" projecttype="C#">
<Contents>
<File name="./DockObject.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
<File name="./AssemblyInfo.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
@@ -15,6 +15,10 @@
<File name="./DockPlaceholder.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
<File name="./DockPaned.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
<File name="./DockNotebook.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+ <File name="./GdlDockTest.cs" subtype="Code" buildaction="Exclude" dependson="" data="" />
+ <File name="./stock-close-12.png" subtype="Code" buildaction="Exclude" dependson="" data="" />
+ <File name="./stock-menu-left-12.png" subtype="Code" buildaction="Exclude" dependson="" data="" />
+ <File name="./stock-menu-right-12.png" subtype="Code" buildaction="Exclude" dependson="" data="" />
</Contents>
<References>
<Reference type="Gac" refto="gtk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" localcopy="True" />
Modified: trunk/MonoDevelop/src/Libraries/Gdl/GdlDockTest.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/GdlDockTest.cs 2004-06-09 07:12:53 UTC (rev 1723)
+++ trunk/MonoDevelop/src/Libraries/Gdl/GdlDockTest.cs 2004-06-09 18:30:01 UTC (rev 1724)
@@ -34,24 +34,20 @@
di2.Add (new Label ("test2"));
dock.AddItem (di2, DockPlacement.Center);
- /*DockItem di3 = new DockItem ("item3", "Item #3", DockItemBehavior.Normal);
+ DockItem di3 = new DockItem ("item3", "Item #3", DockItemBehavior.Normal);
di3.Add (new Label ("test3"));
- dock.AddItem (di3, DockPlacement.Center);
+ dock.AddItem (di3, DockPlacement.Top);
- DockItem di4 = new DockItem ("item4", "Item #4", DockItemBehavior.Normal);
+ /*DockItem di4 = new DockItem ("item4", "Item #4", DockItemBehavior.Normal);
di4.Add (new Label ("test4"));
dock.AddItem (di4, DockPlacement.Center);*/
- Console.WriteLine ("1");
app.Add (dock);
- Console.WriteLine ("2");
app.ShowAll ();
- Console.WriteLine ("3");
- if (dock.Root == null) {
- Console.WriteLine ("Crap, dock.root is null");
- }
+ //if (dock.Root == null) {
+ // Console.WriteLine ("Crap, dock.root is null");
+ //}
Gtk.Application.Run ();
- Console.WriteLine ("4");
}
private void OnAppDelete (object o, DeleteEventArgs args)
More information about the Monodevelop-patches-list
mailing list