From: jpbruyere <jp.bruyere@hotmail.com>
Date: Thu, 23 Apr 2015 11:58:00 +0000 (+0200)
Subject: EventHandler extension method for handling test if null
X-Git-Tag: 0.2~101
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=6a9279526c4b8ecdd15a864033d8cea192277777;p=jp%2Fcrow.git

EventHandler extension method for handling test if null
---

diff --git a/.gitignore b/.gitignore
index 5ad7b970..6a4d9ce0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,11 @@ Debug
 /GOLib.userprefs
 /Tests/obj/*
 /Tests/bin/*
+MonoDevelop.GOLib/bin/
+MonoDevelop.GOLib/build/
+MonoDevelop.GOLib/obj/
+Tests/Tests.sln
+Tests/Tests.userprefs
+src/GraphicObjects/Panel.cs
+src/GraphicObjects/VerticalWrappingWidget.cs
+src/GraphicObjects/HorizontalWrappingWidget.cs
diff --git a/GOLib.csproj b/GOLib.csproj
index af75b9e2..e30f3573 100644
--- a/GOLib.csproj
+++ b/GOLib.csproj
@@ -219,6 +219,14 @@
       <LogicalName>
       </LogicalName>
     </Compile>
+    <Compile Include="src\GraphicObjects\ListBox.cs">
+      <LogicalName>
+      </LogicalName>
+    </Compile>
+    <Compile Include="src\ExtensionsMethods.cs">
+      <LogicalName>
+      </LogicalName>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -234,9 +242,6 @@
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Mono.Cairo" />
-    <Reference Include="OpenTK">
-      <HintPath>..\..\src\opentk-git\Binaries\OpenTK\Release\OpenTK.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -288,4 +293,10 @@
       <LogicalName>go.image.icons.question_mark</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\data\Developpements\Magic3D\OpenTK\Source\OpenTK\OpenTK.csproj">
+      <Project>{A37A7E14-0000-0000-0000-000000000000}</Project>
+      <Name>OpenTK</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>
diff --git a/src/ExtensionsMethods.cs b/src/ExtensionsMethods.cs
new file mode 100644
index 00000000..71be8baa
--- /dev/null
+++ b/src/ExtensionsMethods.cs
@@ -0,0 +1,43 @@
+//
+//  ExtensionsMethods.cs
+//
+//  Author:
+//       Jean-Philippe Bruyère <jp.bruyere@hotmail.com>
+//
+//  Copyright (c) 2015 jp
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+using System;
+
+namespace go
+{
+	public static class ExtensionsMethods
+	{
+		public static void Raise(this EventHandler handler, object sender, EventArgs e)
+		{
+			if(handler != null)
+			{
+				handler(sender, e);
+			}
+		}
+		public static void Raise<T>(this EventHandler<T> handler, object sender, T e)
+		{
+			if(handler != null)
+			{
+				handler(sender, e);
+			}
+		}
+	}
+}
+
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index aa108e22..3f6bbc85 100755
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -150,17 +150,17 @@ namespace go
 		#endregion
 
 		#region EVENT HANDLERS
-		public event EventHandler<MouseWheelEventArgs> MouseWheelChanged = delegate { };
-		public event EventHandler<MouseButtonEventArgs> MouseButtonUp = delegate { };
-		public event EventHandler<MouseButtonEventArgs> MouseButtonDown = delegate { };
-		public event EventHandler<MouseButtonEventArgs> MouseClick = delegate { };
-		public event EventHandler<MouseMoveEventArgs> MouseMove = delegate { };
-		public event EventHandler<MouseMoveEventArgs> MouseEnter = delegate { };
-		public event EventHandler<MouseMoveEventArgs> MouseLeave = delegate { };
-		public event EventHandler<KeyboardKeyEventArgs> KeyDown = delegate { };
-		public event EventHandler<KeyboardKeyEventArgs> KeyUp = delegate { };
-		public event EventHandler Focused = delegate { };
-		public event EventHandler Unfocused = delegate { };
+		public event EventHandler<MouseWheelEventArgs> MouseWheelChanged;
+		public event EventHandler<MouseButtonEventArgs> MouseButtonUp;
+		public event EventHandler<MouseButtonEventArgs> MouseButtonDown;
+		public event EventHandler<MouseButtonEventArgs> MouseClick;
+		public event EventHandler<MouseMoveEventArgs> MouseMove;
+		public event EventHandler<MouseMoveEventArgs> MouseEnter;
+		public event EventHandler<MouseMoveEventArgs> MouseLeave;
+		public event EventHandler<KeyboardKeyEventArgs> KeyDown;
+		public event EventHandler<KeyboardKeyEventArgs> KeyUp;
+		public event EventHandler Focused;
+		public event EventHandler Unfocused;
 		#endregion
 
 		#region public properties
@@ -550,46 +550,46 @@ namespace go
 				onMouseEnter (sender, e);
 			}
 				
-			MouseMove (this, e);
+			MouseMove.Raise (this, e);
 		}
 		public virtual void onMouseButtonUp(object sender, MouseButtonEventArgs e){
 			if (MouseIsIn (e.Position))
 				onMouseClick (sender, e);
 
-			MouseButtonUp (this, e);
+			MouseButtonUp.Raise (this, e);
 		}
 		public virtual void onMouseButtonDown(object sender, MouseButtonEventArgs e){
 			TopContainer.FocusedWidget = this;
 
-			MouseButtonDown (this, e);
+			MouseButtonDown.Raise (this, e);
 		}
 		public virtual void onMouseClick(object sender, MouseButtonEventArgs e){	
-			MouseClick(this,e);
+			MouseClick.Raise (this,e);
 		}
 		public virtual void onMouseWheel(object sender, MouseWheelEventArgs e){
 			GraphicObject p = Parent as GraphicObject;
 			if (p != null)
 				p.onMouseWheel(this,e);
 				
-			MouseWheelChanged (this, e);
+			MouseWheelChanged.Raise (this, e);
 		}
 		public virtual void onFocused(object sender, EventArgs e){
-			Focused (this, e);
+			Focused.Raise (this, e);
 			this.HasFocus = true;
 		}
 		public virtual void onUnfocused(object sender, EventArgs e){
-			Unfocused (this, e);
+			Unfocused.Raise (this, e);
 			this.HasFocus = false;
 		}
 		public virtual void onMouseEnter(object sender, MouseMoveEventArgs e)
 		{
 			Debug.WriteLine ("Mouse enter: " + this.Name);
-			MouseEnter (this, e);
+			MouseEnter.Raise (this, e);
 		}
 		public virtual void onMouseLeave(object sender, MouseMoveEventArgs e)
 		{
 			Debug.WriteLine ("Mouse leave: " + this.Name);
-			MouseLeave (this, e);
+			MouseLeave.Raise (this, e);
 		}
 		#endregion
 
diff --git a/src/GraphicObjects/ListBox.cs b/src/GraphicObjects/ListBox.cs
new file mode 100644
index 00000000..970606c7
--- /dev/null
+++ b/src/GraphicObjects/ListBox.cs
@@ -0,0 +1,51 @@
+//
+//  ListBox.cs
+//
+//  Author:
+//       Jean-Philippe Bruyère <jp.bruyere@hotmail.com>
+//
+//  Copyright (c) 2015 jp
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+using System;
+using System.Collections;
+
+namespace go
+{
+	public class ListBox : GraphicObject
+	{
+		IEnumerable data;
+
+		public IEnumerable Data {
+			get {
+				return data;
+			}
+			set {
+				if (data == value)
+					return;
+				
+				data = value;
+
+				foreach (var item in data) {
+					
+				}
+			}
+		}
+
+		public ListBox ()
+		{
+		}
+	}
+}
+
diff --git a/src/GraphicObjects/NumericControl.cs b/src/GraphicObjects/NumericControl.cs
index 1d4336e2..51a3fdc5 100644
--- a/src/GraphicObjects/NumericControl.cs
+++ b/src/GraphicObjects/NumericControl.cs
@@ -24,9 +24,8 @@ namespace go
 		public EventHandler<ValueChangeEventArgs> ValueChanged;
 
 		public virtual void onValueChanged(object sender, ValueChangeEventArgs e)
-		{
-			if (ValueChanged != null)
-				ValueChanged (sender, e);
+		{			
+			ValueChanged.Raise (sender, e);
 		}
 		#endregion
 
diff --git a/src/GraphicObjects/TextBox.cs b/src/GraphicObjects/TextBox.cs
index be7cdab9..20403789 100644
--- a/src/GraphicObjects/TextBox.cs
+++ b/src/GraphicObjects/TextBox.cs
@@ -91,11 +91,11 @@ namespace go
 		}
 		#endregion
 
-		public event EventHandler<TextChangeEventArgs> TextChanged = delegate { };
+		public event EventHandler<TextChangeEventArgs> TextChanged;
 
 		public virtual void onTextChanged(Object sender, TextChangeEventArgs e)
 		{
-			TextChanged (this, e);
+			TextChanged.Raise (this, e);
 		}
 			
         #region Keyboard handling
diff --git a/src/GraphicObjects/WrappedWidgetGroup.cs b/src/GraphicObjects/WrappedWidgetGroup.cs
new file mode 100755
index 00000000..afd54e6c
--- /dev/null
+++ b/src/GraphicObjects/WrappedWidgetGroup.cs
@@ -0,0 +1,154 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Drawing;
+using OpenTK.Graphics.OpenGL;
+using System.Diagnostics;
+
+namespace go
+{
+    public class WrappedWidgetGroup : Group
+    {
+
+        public int widgetSpacing = 2;
+
+        public Orientation Orientation = Orientation.Horizontal;
+
+
+        public WrappedWidgetGroup()
+            : base()
+        {
+            BorderWidth = 0;
+        }
+
+        int currentXForWidget = 0;
+        int currentYForWidget = 0;
+
+        int highestWidget = 0;
+        int largestWidget = 0;
+
+
+        public override void UpdateLayout()
+        {
+            //while (!layoutIsValid)
+            //{
+            //if (!(sizeIsValid && positionIsValid))
+            base.UpdateLayout();
+
+            //if (!base.layoutIsValid)
+            //    return;
+
+            currentXForWidget = ClientRectangle.X;
+            currentYForWidget = ClientRectangle.Y;
+
+            highestWidget = 0;
+            largestWidget = 0;
+
+            Rectangle contentBounds = Rectangle.Zero;
+
+            GraphicObject[] widgets = new GraphicObject[Children.Count];
+            Children.CopyTo(widgets);
+            foreach (GraphicObject w in widgets)
+            {
+                if (w.renderBounds.Width > largestWidget)
+                    largestWidget = w.renderBounds.Width;
+                if (w.renderBounds.Height > highestWidget)
+                    highestWidget = w.renderBounds.Height;
+
+                if (!enoughtSpaceForWidget(w))
+                    advance(w);
+
+                if (enoughtSpaceForWidget(w))
+                {
+                    w.renderBounds.X = currentXForWidget;
+                    w.renderBounds.Y = currentYForWidget;
+
+                    w.positionIsValid = true;
+
+                    contentBounds += w.renderBounds;
+
+                    advance(w);
+                }
+                else
+                    break;
+            }
+
+            contentBounds.Width += BorderWidth + Margin;
+            contentBounds.Height += BorderWidth + Margin;
+
+            if (SizeToContent)
+                renderBounds.Size = contentBounds.Size;
+            else if (VerticalScrolling)
+                renderBounds.Size = new Size(renderBounds.Size.Width, contentBounds.Size.Height);
+            else if (HorizontalScrolling)
+                renderBounds.Size = new Size(contentBounds.Size.Width, renderBounds.Size.Height);
+
+            if (layoutIsValid)
+                registerForRedraw();
+        }
+
+
+        bool enoughtSpaceForWidget(GraphicObject w)
+        {
+            int nextXForWidget = 0;
+            int nextYForWidget = 0;
+
+            if (Orientation == Orientation.Horizontal)
+                nextXForWidget = currentXForWidget + w.renderBounds.Width;
+            else
+                nextYForWidget = nextYForWidget + w.renderBounds.Height;
+
+            if (!SizeToContent)
+            {
+                if (nextXForWidget > ClientRectangle.Right && !HorizontalScrolling)
+                    return false;
+                if (currentYForWidget > ClientRectangle.Bottom && !VerticalScrolling)
+                    return false;
+            }
+            return true;
+        }
+        void advance(GraphicObject w)
+        {
+            if (Orientation == Orientation.Horizontal)
+            {
+                //if (w is LabelWidget)
+                //    Debugger.Break();
+                currentXForWidget = currentXForWidget + widgetSpacing + w.renderBounds.Width;
+            }
+            else
+                currentYForWidget = currentYForWidget + widgetSpacing + w.renderBounds.Height;
+
+            if (!SizeToContent)
+            {
+                if (currentXForWidget > ClientRectangle.Right && !HorizontalScrolling)
+                {
+                    if (Orientation == Orientation.Vertical)
+                    {
+                        //not scrolling
+                    }
+                    else
+                    {
+                        currentXForWidget = ClientRectangle.X;
+                        currentYForWidget += widgetSpacing + highestWidget;
+                        highestWidget = 0;
+                    }
+                }
+                if (currentYForWidget > ClientRectangle.Bottom && !VerticalScrolling)
+                {
+                    if (Orientation == Orientation.Horizontal)
+                    {
+                        //not scrolling
+                    }
+                    else
+                    {
+                        currentXForWidget += widgetSpacing + largestWidget;
+                        currentYForWidget = ClientRectangle.Y;
+                        largestWidget = 0;
+                    }
+
+                }
+            }
+        }
+    }
+}
diff --git a/src/OpenTKGameWindow.cs b/src/OpenTKGameWindow.cs
index 1e5b5d86..234c4be2 100755
--- a/src/OpenTKGameWindow.cs
+++ b/src/OpenTKGameWindow.cs
@@ -87,11 +87,11 @@ namespace go
 
 		#region Events
 		//those events are raised only if mouse isn't in a graphic object
-		public event EventHandler<MouseWheelEventArgs> MouseWheelChanged = delegate { };
-		public event EventHandler<MouseButtonEventArgs> MouseButtonUp = delegate { };
-		public event EventHandler<MouseButtonEventArgs> MouseButtonDown = delegate { };
-		public event EventHandler<MouseButtonEventArgs> MouseClick = delegate { };
-		public event EventHandler<MouseMoveEventArgs> MouseMove = delegate { };
+		public event EventHandler<MouseWheelEventArgs> MouseWheelChanged;
+		public event EventHandler<MouseButtonEventArgs> MouseButtonUp;
+		public event EventHandler<MouseButtonEventArgs> MouseButtonDown;
+		public event EventHandler<MouseButtonEventArgs> MouseClick;
+		public event EventHandler<MouseMoveEventArgs> MouseMove;
 		#endregion
 
 		#region focus
@@ -407,7 +407,7 @@ namespace go
 				}
 			}
 			_hoverWidget = null;
-			MouseMove (this, e);
+			MouseMove.Raise (this, e);
         }
         void Mouse_ButtonUp(object sender, MouseButtonEventArgs e)
         {
@@ -416,12 +416,12 @@ namespace go
 
 			_activeWidget.onMouseButtonUp (this, e);
 			_activeWidget = null;
-			MouseButtonUp (this, e);
+			MouseButtonUp.Raise (this, e);
         }
         void Mouse_ButtonDown(object sender, MouseButtonEventArgs e)
         {
 			if (_hoverWidget == null) {
-				MouseButtonDown (this, e);
+				MouseButtonDown.Raise (this, e);
 				return;
 			}
 
@@ -439,7 +439,7 @@ namespace go
         void Mouse_WheelChanged(object sender, MouseWheelEventArgs e)
         {
 			if (_hoverWidget == null) {
-				MouseWheelChanged (this, e);
+				MouseWheelChanged.Raise (this, e);
 				return;
 			}
 			_hoverWidget.onMouseWheel (this, e);