From: jpbruyere Date: Tue, 18 Oct 2016 09:38:37 +0000 (+0200) Subject: Merge branch 'master' into CrowIDE X-Git-Tag: v0.5.1~28^2~27 X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=ad18d88bb157dee50dab5f60809623fe2cf5d0ee;p=jp%2Fcrow.git Merge branch 'master' into CrowIDE --- ad18d88bb157dee50dab5f60809623fe2cf5d0ee diff --cc Templates/ListBox.template index 36f2f61e,18f01c9d..39f05a3a --- a/Templates/ListBox.template +++ b/Templates/ListBox.template @@@ -1,9 -1,8 +1,8 @@@ - + + Height="Fit" Name="ItemsContainer" Margin="0" VerticalAlignment="Top"/> -- ++ diff --cc Templates/ScrollingListBox.goml index 54e3eb48,2093d4d8..7440bc62 --- a/Templates/ScrollingListBox.goml +++ b/Templates/ScrollingListBox.goml @@@ -10,6 -10,6 +10,6 @@@ + Width="14" /> -- ++ diff --cc Templates/Window.template index 6b3932c1,bbd1e57a..7325193c --- a/Templates/Window.template +++ b/Templates/Window.template @@@ -20,6 -19,6 +19,6 @@@ - + -- ++ diff --cc Templates/treeList.crow index 160f351a,fbd47055..d47621af --- a/Templates/treeList.crow +++ b/Templates/treeList.crow @@@ -1,3 -1,3 +1,3 @@@ - Height="Fit" Name="ItemsContainer"/> ++ Height="Fit" Name="ItemsContainer"/> diff --cc Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow index 94625915,f4d37a74..b95e7508 --- a/Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow +++ b/Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow @@@ -37,4 -37,4 +37,4 @@@