diff options
| author | jpbruyere <jp.bruyere@hotmail.com> | 2015-09-03 12:48:04 +0200 |
|---|---|---|
| committer | jpbruyere <jp.bruyere@hotmail.com> | 2015-09-03 12:48:04 +0200 |
| commit | 6fd66d56dd5789eae345a517dc42f3488cf7aca6 (patch) | |
| tree | d8668c1870fa1cb91edac7d3d788aeed174a4c1f /src/GraphicObjects | |
| parent | fcfe9c2189fbbb00b0901b246e401b0f05413c7f (diff) | |
* GOLib.sln:
* GOLib.csproj:
* GOLIBTest_0.cs:
* GOLIBTest_fps.cs:
* ReflexionExtensions.cs:
* Label.cs:
* test4.goml:
* GenericStack.cs:
* PrivateContainer.cs:
* CompilerServices.cs:
* Tests.csproj:
* member.svg:
* GOLIBTest_TypeViewer.cs:
* tmpMembers.goml:
* testTypeViewer.goml: Type viewer
* Group.cs:
* Window.cs:
* GraphicObject.cs: set OnLayoutChanges to public
* Point.cs: Implement length
Diffstat (limited to 'src/GraphicObjects')
| -rw-r--r-- | src/GraphicObjects/GenericStack.cs | 4 | ||||
| -rw-r--r-- | src/GraphicObjects/GraphicObject.cs | 2 | ||||
| -rw-r--r-- | src/GraphicObjects/Group.cs | 2 | ||||
| -rwxr-xr-x | src/GraphicObjects/Label.cs | 4 | ||||
| -rw-r--r-- | src/GraphicObjects/PrivateContainer.cs | 2 | ||||
| -rw-r--r-- | src/GraphicObjects/Window.cs | 11 |
6 files changed, 19 insertions, 6 deletions
diff --git a/src/GraphicObjects/GenericStack.cs b/src/GraphicObjects/GenericStack.cs index 3b96d548..20130576 100644 --- a/src/GraphicObjects/GenericStack.cs +++ b/src/GraphicObjects/GenericStack.cs @@ -125,13 +125,13 @@ namespace go else if (gobjs.Length == 1) {
int sz = Children.Where(ch=>ch.Visible).Except (gobjs).Sum (g => g.Slot.Width);
if (sz < Slot.Width) {
- gobjs [0].Slot.Width = Slot.Width - sz - Spacing;
+ gobjs [0].Slot.Width = Slot.Width - sz - (Children.Count+1) * Spacing;
int idx = Children.IndexOf (gobjs [0]);
if (idx > 0 && idx < Children.Count - 1)
gobjs [0].Slot.Width -= Spacing;
-
if (gobjs [0].LastSlots.Width != gobjs [0].Slot.Width) {
gobjs [0].bmp = null;
+ //gobjs [0].OnLayoutChanges (LayoutingType.Width);
gobjs [0].LastSlots.Width = gobjs [0].Slot.Width;
}
}
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs index 457a6016..e1e2963b 100644 --- a/src/GraphicObjects/GraphicObject.cs +++ b/src/GraphicObjects/GraphicObject.cs @@ -456,7 +456,7 @@ namespace go }
/// <summary> trigger dependant sizing component update </summary>
- protected virtual void OnLayoutChanges(LayoutingType layoutType)
+ public virtual void OnLayoutChanges(LayoutingType layoutType)
{
if (Parent==null)
return;
diff --git a/src/GraphicObjects/Group.cs b/src/GraphicObjects/Group.cs index aac566db..e7a4b2b6 100644 --- a/src/GraphicObjects/Group.cs +++ b/src/GraphicObjects/Group.cs @@ -120,7 +120,7 @@ namespace go return tmp;
}
- protected override void OnLayoutChanges (LayoutingType layoutType)
+ public override void OnLayoutChanges (LayoutingType layoutType)
{
base.OnLayoutChanges (layoutType);
diff --git a/src/GraphicObjects/Label.cs b/src/GraphicObjects/Label.cs index e9951862..c0bfe47e 100755 --- a/src/GraphicObjects/Label.cs +++ b/src/GraphicObjects/Label.cs @@ -202,7 +202,9 @@ namespace go lines [selectionEnd.Y].Substring (selectionEnd.X, lines [selectionEnd.Y].Length - selectionEnd.X);
l++;
for (int c = 0; c < linesToRemove-1; c++)
- lines.RemoveAt (l);
+ lines.RemoveAt (l);
+ currentCol = selectionStart.X;
+ currentLine = selectionStart.Y;
} else
lines [l] = lines [l].Remove (selectionStart.X, selectionEnd.X - selectionStart.X);
currentCol = selectionStart.X;
diff --git a/src/GraphicObjects/PrivateContainer.cs b/src/GraphicObjects/PrivateContainer.cs index cd234d62..025934f9 100644 --- a/src/GraphicObjects/PrivateContainer.cs +++ b/src/GraphicObjects/PrivateContainer.cs @@ -92,7 +92,7 @@ namespace go return child == null ? Bounds.Size : new Size(child.Slot.Width + 2 * Margin, child.Slot.Height + 2 * (Margin)); } - protected override void OnLayoutChanges (LayoutingType layoutType) + public override void OnLayoutChanges (LayoutingType layoutType) { switch (layoutType) { case LayoutingType.Width: diff --git a/src/GraphicObjects/Window.cs b/src/GraphicObjects/Window.cs index 7eb910cc..0fd2b780 100644 --- a/src/GraphicObjects/Window.cs +++ b/src/GraphicObjects/Window.cs @@ -36,8 +36,19 @@ namespace go void Window_MouseMove (object sender, OpenTK.Input.MouseMoveEventArgs e) { + +// if ((e.Position - this.Slot.TopLeft).Length < 3) +// System.Windows.Forms.Cursor.Current = System.Windows.Forms.Cursors.SizeNWSE; +// else +// System.Windows.Forms.Cursor.Current = System.Windows.Forms.Cursors.Default; + if (!e.Mouse.IsButtonDown (MouseButton.Left)) return; + + // + + System.Windows.Forms.Cursor.Show();// = System.Windows.Forms.Cursors.SizeAll; + this.TopContainer.redrawClip.AddRectangle (this.ScreenCoordinates(this.Slot)); this.Left += e.XDelta; this.Top += e.YDelta; |