]> O.S.I.I.S - jp/crow.git/commitdiff
Merge branch 'master' into CrowIDE
authorjpbruyere <jp.bruyere@hotmail.com>
Tue, 18 Oct 2016 09:38:37 +0000 (11:38 +0200)
committerjpbruyere <jp.bruyere@hotmail.com>
Tue, 18 Oct 2016 09:41:06 +0000 (11:41 +0200)
1  2 
Crow.sln
Templates/ListBox.template
Templates/ScrollingListBox.goml
Templates/Window.template
Templates/treeList.crow
Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow
src/CompilerServices/CompilerServices.cs

diff --cc Crow.sln
Simple merge
index 36f2f61e218e626d375f4edd00a2fabbb0db130a,18f01c9dc10b6f116e09c8044325f1708baf7730..39f05a3a250ae8f334177dfd4e5f721eb2f515a8
@@@ -1,9 -1,8 +1,8 @@@
  <?xml version="1.0"?>
- <Border BorderWidth="1" Margin="1" MinimumSize="10,10" Height="{./HeightPolicy}" Width="{./WidthPolicy}" >
+ <Border BorderWidth="1" Margin="1" MinimumSize="10,10">
        <Scroller  Name="scroller1" Margin="1" VerticalScrolling="true"
-               Height="{./HeightPolicy}" Width="{./WidthPolicy}"
                ValueChanged="./_scroller_ValueChanged">
                <VerticalStack LayoutChanged="./_list_LayoutChanged"
-                       Height="Fit" Width="{./WidthPolicy}" Name="ItemsContainer" Margin="0" VerticalAlignment="Top"/>
+                       Height="Fit" Name="ItemsContainer" Margin="0" VerticalAlignment="Top"/>
        </Scroller>
--</Border>
++</Border>
index 54e3eb482c27494e71c849b4117b6b80aed0e4c9,2093d4d8c54745418f69892cb07da8d57e77f8c5..7440bc6223067a51a8a7cbfa6a3f5031b02c52ca
@@@ -10,6 -10,6 +10,6 @@@
                </Scroller>
                <ScrollBar Name="scrollbar1" Value="{../scroller1.ScrollY}" 
                        Maximum="{../scroller1.MaximumScroll}" Orientation="Vertical" 
-                       Width="14" Height="{./HeightPolicy}" />
+                       Width="14" />
        </HorizontalStack>
--</Border>
++</Border>
index 6b3932c14c80d1beefc84ef8a6db8b10aa474fec,bbd1e57a1f40ac7a1fc3dcef640fb2f13cc66bdd..7325193c9018d867b14a603c2931c19f4401e840
@@@ -20,6 -19,6 +19,6 @@@
                                <GraphicObject Width="5"/>
                        </HorizontalStack>
  <!--          </Border>-->
-               <Container Name="Content" MinimumSize="50,50" Height="{./HeightPolicy}" Width="{./WidthPolicy}" Background="0.5,0.5,0.5,0.5"/>
+               <Container Name="Content" MinimumSize="50,50" Background="0.5,0.5,0.5,0.5"/>
        </VerticalStack>
--</Border>
++</Border>
index 160f351a7475cce73a98139bbf9d1dccb3f3c89b,fbd47055a6964964563eb71ccf16da13f57c5f39..d47621afab1a6b93ac93fccd97f8f2a5509a7343
@@@ -1,3 -1,3 +1,3 @@@
  <?xml version="1.0"?>
  <VerticalStack
-       Height="Fit" Width="{../WidthPolicy}" Name="ItemsContainer"/>
 -      Height="Fit" Name="ItemsContainer"/>
++      Height="Fit" Name="ItemsContainer"/>
index 94625915349917515fe5ac53dda9bb8e9ff9bb72,f4d37a74c88bc8d2f7a8aea730f77eb114315618..b95e750889588a602b0809147b55488d611785c6
@@@ -37,4 -37,4 +37,4 @@@
                        <Button Caption="Clear" MouseClick="OnClear"/>
                </HorizontalStack>
        </VerticalStack>
--</Border>
++</Border>
index 26a185eda84172d2da58b36f28fecd354c705dbe,43c9d7048dfd004adbb92093a4c7f98e44f1b0b8..96f129638a73f78bf0a3679606211f5be236bf72
@@@ -15,10 -15,12 +15,12 @@@ namespace Cro
                static MethodInfo miAddBinding = typeof(GraphicObject).GetMethod ("BindMember");
                static FieldInfo miSetCurIface = typeof(GraphicObject).GetField ("currentInterface",
                        BindingFlags.NonPublic | BindingFlags.Instance);
 -              static MethodInfo stringEquals = typeof (string).GetMethod
 -                      ("Equals", new Type [3] { typeof (string), typeof (string), typeof (StringComparison) });
+               static MethodInfo miFindByName = typeof (GraphicObject).GetMethod ("FindByName");
 -              
++
  
                #region ValueChange Reflexion member info
 +              static MethodInfo stringEquals = typeof (string).GetMethod
 +                      ("Equals", new Type [3] { typeof (string), typeof (string), typeof (StringComparison) });
                static EventInfo eiValueChange = typeof (IValueChange).GetEvent ("ValueChanged");
                static MethodInfo miInvokeValueChange = eiValueChange.EventHandlerType.GetMethod ("Invoke");
                static Type [] argsValueChange = { typeof (object), typeof (object), miInvokeValueChange.GetParameters () [1].ParameterType };