From: jpbruyere <jp.bruyere@hotmail.com>
Date: Sun, 21 Jun 2015 13:39:58 +0000 (+0200)
Subject: * OpenTK:
X-Git-Tag: 0.2~77
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=dc995bd1da98971009454f4efe043d6237d00729;p=jp%2Fcrow.git

* OpenTK:
* OpenTKGameWindow.cs:

* Tests.csproj:
* GOLIBTest_4.cs:
* GOLIBTest_1.cs:
* Window.goml:
* Listbox.goml:
* test4.goml:
* GOLIBTest_Expandable.cs:
* testExpandable.goml: debug and test

* Colors.cs: debug argb->rgba

* CompilerServices.cs: value type conversion

* Border.cs: default border =1

* Checkbox.cs:
* Expandable.cs: changes in update technic

* Group.cs: Clipping debug (need rework)

* Label.cs: debug text positionning

* Slider.cs: debug

* TextBox.cs: selectable=true by default
---

diff --git a/Templates/Listbox.goml b/Templates/Listbox.goml
index 452877c3..08b650d5 100755
--- a/Templates/Listbox.goml
+++ b/Templates/Listbox.goml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<Border Margin="0" MinimumSize="0;200" Fit="True" Background="Gray">
+<Border BorderWidth="1" Margin="1" MinimumSize="0;100" Fit="True" Background="Gray">
 	<VerticalStack Name="List" Margin="1" VerticalAlignment="Top"/>
 </Border>
\ No newline at end of file
diff --git a/Templates/Window.goml b/Templates/Window.goml
index 5964d023..97e980c2 100755
--- a/Templates/Window.goml
+++ b/Templates/Window.goml
@@ -5,7 +5,7 @@
 			MouseMove="Window_MouseMove">
 			<HorizontalStack Margin="1" Spacing="1" Height="-1" Width="0" Focusable="true" MouseMove="Window_MouseMove">
 				<Image Name="Image" Margin="1" Width="16" Height="16" Path="#go.Images.Icons.tetra.png"/>
-				<Label Width="0" Focusable="true" Name="Title" MouseMove="Window_MouseMove"/>
+				<Label Width="0" Focusable="true" Name="Title" MouseMove="Window_MouseMove" Margin="5" />
 				<Image Focusable="true" Name="Image" Margin="1" Width="16" Height="16" Path="#go.Images.Icons.exit.svg"
 					MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}" MouseClick="butQuitPress"/>
 			</HorizontalStack>
diff --git a/Tests/GOLIBTest_1.cs b/Tests/GOLIBTest_1.cs
index 1f376047..f92cd16c 100644
--- a/Tests/GOLIBTest_1.cs
+++ b/Tests/GOLIBTest_1.cs
@@ -27,7 +27,7 @@ namespace test
 		protected override void OnLoad (EventArgs e)
 		{
 			base.OnLoad (e);
-			LoadInterface("Interfaces/log.xml", out g);
+			LoadInterface("Interfaces/test1.goml", out g);
 
 		}
 		protected override void OnRenderFrame (FrameEventArgs e)
diff --git a/Tests/GOLIBTest_4.cs b/Tests/GOLIBTest_4.cs
index 97e8c626..c283b2e1 100644
--- a/Tests/GOLIBTest_4.cs
+++ b/Tests/GOLIBTest_4.cs
@@ -172,9 +172,9 @@ namespace test
 			}
 			frameCpt++;
 
-//			if (pb.Value == pb.Maximum)
-//				pb.Value = 0;
-//			pb.Value++;
+			if (pb.Value == pb.Maximum)
+				pb.Value = 0;
+			pb.Value++;
 			pb2.Value = pb.Value;
 			//labPb.Text = pb.Value.ToString ();
 			if (FocusedWidget==null)
diff --git a/Tests/GOLIBTest_Expandable.cs b/Tests/GOLIBTest_Expandable.cs
index 9da9b1ab..d96290c1 100644
--- a/Tests/GOLIBTest_Expandable.cs
+++ b/Tests/GOLIBTest_Expandable.cs
@@ -1,4 +1,5 @@
 #define MONO_CAIRO_DEBUG_DISPOSE
+#define DEBUG_CLIP_RECTANGLE
 
 
 using System;
diff --git a/Tests/Interfaces/test4.goml b/Tests/Interfaces/test4.goml
index 4eb5af9a..646599c9 100755
--- a/Tests/Interfaces/test4.goml
+++ b/Tests/Interfaces/test4.goml
@@ -54,7 +54,7 @@
 						Foreground="BlueCrayola" Background="DarkGray"
 						BorderWidth="2" BorderColor="White"/>
 					<Label Name="labPb"
-						Width="20"
+						Width="30"
 						TextAlignment="RightCenter"/>
 				</HorizontalStack>
 				<HorizontalStack  Name="hsFocus">
@@ -72,12 +72,10 @@
 				<Button  Margin="5" BorderWidth="0" Width="-1" Height="-1"  HorizontalAlignment="Center">
 					<Label FontSize="18" Text="This is a test" Margin="5" Foreground="Black" />
 				</Button>
-				<TextBoxWidget 	TextAlignment="LeftCenter" Font="droid,14"						
+				<TextBoxWidget Name="textbox1" TextAlignment="LeftCenter" Font="droid,14"						
 								Width="300" Height="-1" Margin="2"
 								BorderColor="White" BorderWidth="1"
 								Text="editable text"/>
-								<Slider Height="10" Width="300" BorderWidth="1" Background="Transparent" />
-								<Slider Height="10" Width="300" BorderWidth="1" Background="Transparent" />
 				<GroupBox Title="Group Box" Width="300" Height="100" 
 					BorderColor="White" BorderWidth="2" Margin="3">
 					<Label Name="labValue" FontSize="14" Text="000"	TextAlignment="Center"/>
@@ -90,7 +88,9 @@
 					<Image Path="#Tests.image.tetra.png"/>
 				</Button>
 				<Popper Width="100">
-					<Image Fit="true" Path="#Tests.image.tetra.png"/>
+					<Border Margin="10" Fit="True" Background="ArmyGreen">
+						<Image Fit="true" Path="#go.Images.Icons.tetra.png"/>
+					</Border>
 				</Popper>
 				<Expandable Name="expander" Width="150" Height="-1">
 					<VerticalStack Name="vsExpanded" Width="100">
diff --git a/Tests/Interfaces/testExpandable.goml b/Tests/Interfaces/testExpandable.goml
index 3349f61d..a292cdde 100755
--- a/Tests/Interfaces/testExpandable.goml
+++ b/Tests/Interfaces/testExpandable.goml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<Container Name="TopContainer" Width="400" Height="-1"
+<Container Name="TopContainer" Width="400" Height="400"
 	Margin="20" Focusable="True" Background="Gray">
 
-	<Expandable Width="150" Background="Green" Margin="2">
-			<VerticalStack Width="100" Background="Red">
+	<Expandable Width="150" Height="-1" Margin="2" VerticalAlignment="Top">
+			<VerticalStack Width="100" >
 				<Checkbox Name="chk1"/>
 				<Checkbox Name="chk2" IsChecked="true"/>
 				<Checkbox Name="chk3"/>
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 9ca28ed0..57e19ad4 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Tests</RootNamespace>
     <AssemblyName>Tests</AssemblyName>
-    <StartupObject>test.GOLIBTest_Window</StartupObject>
+    <StartupObject>test.GOLIBTest_4</StartupObject>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <OutputPath>..\bin\$(configuration)</OutputPath>
     <IntermediateOutputPath>obj\$(configuration)</IntermediateOutputPath>
diff --git a/src/Colors.cs b/src/Colors.cs
index 2d428bae..96d17f2a 100755
--- a/src/Colors.cs
+++ b/src/Colors.cs
@@ -1021,11 +1021,11 @@ namespace go
 		#region IXmlSerializable
 		public void ReadXml(System.Xml.XmlReader reader)
         {
-            string[] c = reader["Color"].Split(new char[] { ';' });
-            A = double.Parse(c[0]);
-            R = double.Parse(c[1]);
-            G = double.Parse(c[2]);
-            B = double.Parse(c[3]);
+            string[] c = reader["Color"].Split(new char[] { ';' });            
+            R = double.Parse(c[0]);
+            G = double.Parse(c[1]);
+            B = double.Parse(c[2]);
+			A = double.Parse(c[3]);
         }
         public void WriteXml(System.Xml.XmlWriter writer)
         {
diff --git a/src/CompilerServices/CompilerServices.cs b/src/CompilerServices/CompilerServices.cs
index d7d19fa1..ae4b700a 100644
--- a/src/CompilerServices/CompilerServices.cs
+++ b/src/CompilerServices/CompilerServices.cs
@@ -270,8 +270,12 @@ namespace go
 				
 				if (!srcValueType.IsValueType)
 					il.Emit(OpCodes.Castclass, srcValueType);
-				if (piTarget.PropertyType == typeof(string))
-					il.Emit(OpCodes.Callvirt, miToStr);
+				else
+					il.Emit( OpCodes.Callvirt, GetConvertMethod( piTarget.PropertyType ));
+			//	if (piTarget.PropertyType == typeof(string))
+//				else if ( srcValueType != piTarget.PropertyType)
+//					
+				
 				il.Emit(OpCodes.Callvirt, piTarget.GetSetMethod());
 			}
 			il.MarkLabel(labFailed);
@@ -284,6 +288,31 @@ namespace go
 			//Delegate del = dm.CreateDelegate(typeof(System.EventHandler));
 			addHandler.Invoke(_source, new object[] {del});
 		}
+
+		#region conversions
+
+		internal static MethodInfo GetConvertMethod( Type targetType )
+		{
+			string name;
+
+			if( targetType == typeof( bool ) )
+				name = "ToBoolean";
+			else if( targetType == typeof( byte ) )
+				name = "ToByte";
+			else if( targetType == typeof( short ) )
+				name = "ToInt16";
+			else if( targetType == typeof( int ) )
+				name = "ToInt32";
+			else if( targetType == typeof( long ) )
+				name = "ToInt64";
+			else if (targetType == typeof (string ) )
+				return typeof(object).GetMethod("ToString", Type.EmptyTypes);
+			else
+				throw new NotImplementedException( string.Format( "Conversion to {0} is not implemented.", targetType.Name ) );
+
+			return typeof( Convert ).GetMethod( name, BindingFlags.Static | BindingFlags.Public, null, new Type[] { typeof( object ) }, null );
+		}
+		#endregion
 			
 		public static FieldInfo getEventHandlerField(Type type, string eventName)
 		{
diff --git a/src/GraphicObjects/Border.cs b/src/GraphicObjects/Border.cs
index 352b626a..f2ce01e2 100644
--- a/src/GraphicObjects/Border.cs
+++ b/src/GraphicObjects/Border.cs
@@ -16,7 +16,7 @@ namespace go
 		#endregion
 
 		#region public properties
-		[XmlAttributeAttribute()][DefaultValue(2)]
+		[XmlAttributeAttribute()][DefaultValue(1)]
 		public virtual int BorderWidth {
 			get { return _borderWidth; }
 			set {
diff --git a/src/GraphicObjects/Checkbox.cs b/src/GraphicObjects/Checkbox.cs
index 0e20ddb7..30db3849 100644
--- a/src/GraphicObjects/Checkbox.cs
+++ b/src/GraphicObjects/Checkbox.cs
@@ -62,7 +62,7 @@ namespace go
 				else
 					_image.SvgSub = "unchecked";
 				                
-                registerForGraphicUpdate();
+                //registerForGraphicUpdate();
             }
         }
 
diff --git a/src/GraphicObjects/Expandable.cs b/src/GraphicObjects/Expandable.cs
index 369930a8..8b3f4b1a 100644
--- a/src/GraphicObjects/Expandable.cs
+++ b/src/GraphicObjects/Expandable.cs
@@ -54,8 +54,8 @@ namespace go
 				return;
 			_image.SvgSub = "collapsed";
 
-			this.Expand += (object sender, EventArgs e) => {_image.SvgSub = "expanded";};
-			this.Collapse += (object sender, EventArgs e) => {_image.SvgSub = "collapsed";};
+//			this.Expand += (object sender, EventArgs e) => {};
+//			this.Collapse += (object sender, EventArgs e) => {};
 
 		}
 			
@@ -86,18 +86,20 @@ namespace go
 				else
 					onCollapse (this, null);
 
-                registerForGraphicUpdate();
+                //registerForGraphicUpdate();
             }
         }
 
 		public virtual void onExpand(object sender, EventArgs e)
 		{
 			_contentContainer.Visible = true;
+			_image.SvgSub = "expanded";
 			Expand.Raise (this, e);
 		}
 		public virtual void onCollapse(object sender, EventArgs e)
 		{
 			_contentContainer.Visible = false;
+			_image.SvgSub = "collapsed";
 			Collapse.Raise (this, e);
 		}
 			
diff --git a/src/GraphicObjects/Group.cs b/src/GraphicObjects/Group.cs
index f1620a2a..aac566db 100644
--- a/src/GraphicObjects/Group.cs
+++ b/src/GraphicObjects/Group.cs
@@ -178,8 +178,13 @@ namespace go
 				if (clip != null) {
 					clip.Rebase (this);									
 					//localClip = clip.intersectingRects (Slot.Size);
-				} else
+				} else {
 					clip = new Rectangles ();
+					//TODO:added lately slot to empty clip,
+					//should rework this precise case causing expandable not
+					//to show image changes
+					clip.AddRectangle (ContextCoordinates (Slot.Size));
+				}
 
 				if (!DrawingIsValid || clip != null) {//false when 1 child has changed
 					//child having their content changed has to be repainted
diff --git a/src/GraphicObjects/Label.cs b/src/GraphicObjects/Label.cs
index 27a766d2..e9951862 100755
--- a/src/GraphicObjects/Label.cs
+++ b/src/GraphicObjects/Label.cs
@@ -287,6 +287,8 @@ namespace go
 			//gr.FontOptions.HintMetrics = HintMetrics.On;
 
 			rText = new Rectangle(measureRawSize());
+			rText.Width -= 2 * Margin;
+			rText.Height -= 2 * Margin;
 
 			widthRatio = 1f;
 			heightRatio = 1f;
@@ -479,6 +481,24 @@ namespace go
 				if (string.IsNullOrWhiteSpace (l))
 					continue;
 			
+//				double t = rText.Y;
+//				gr.LineWidth = 1;
+//				gr.Color = Color.Green;
+//				gr.MoveTo (rText.X, t);
+//				gr.LineTo (rText.X + rText.Width, t);
+//				gr.Stroke ();
+//				gr.MoveTo (rText.X, t + rText.Height);
+//				gr.LineTo (rText.X + rText.Width, t + rText.Height);
+//				gr.Stroke ();
+//				gr.Rectangle (rText);
+//				gr.Fill ();
+//
+//				t += fe.Ascent;
+//				gr.Color = Color.Red;
+//				gr.MoveTo (rText.X, t);
+//				gr.LineTo (rText.X + rText.Width, t);
+//				gr.Stroke ();
+
 				gr.Color = Foreground;				
 				gr.MoveTo (rText.X, rText.Y + fe.Ascent + fe.Height * i);
 
diff --git a/src/GraphicObjects/Slider.cs b/src/GraphicObjects/Slider.cs
index 7a5623f8..25da2241 100644
--- a/src/GraphicObjects/Slider.cs
+++ b/src/GraphicObjects/Slider.cs
@@ -119,7 +119,6 @@ namespace go
 
 			cursor.TopLeft = new Point(r.Left + (int)(Value * unity),
                                         (int)(p1.Y - cursor.Height / 2));  
-			Debug.WriteLine (cursor.TopLeft.ToString ());
         }
         
 		#region mouse handling
diff --git a/src/GraphicObjects/TextBox.cs b/src/GraphicObjects/TextBox.cs
index 28e7c74c..7ba10fe8 100644
--- a/src/GraphicObjects/TextBox.cs
+++ b/src/GraphicObjects/TextBox.cs
@@ -44,6 +44,11 @@ namespace go
 			get { return base.Focusable; }
 			set { base.Focusable = value; }
 		}
+		[XmlAttributeAttribute()][DefaultValue(true)]
+		public override bool Selectable {
+			get { return base.Selectable; }
+			set { base.Selectable = value; }
+		}
 		[XmlAttributeAttribute()][DefaultValue("White")]
 		public override Color Background {
 			get { return base.Background; }
diff --git a/src/OpenTKGameWindow.cs b/src/OpenTKGameWindow.cs
index 38d230f7..81fea59d 100755
--- a/src/OpenTKGameWindow.cs
+++ b/src/OpenTKGameWindow.cs
@@ -1,6 +1,4 @@
 // Released to the public domain. Use, modify and relicense at will.
-//#define DEBUG_CLIP_RECTANGLE
-
 using System;
 
 using OpenTK;