From 3a9f41db61efebc74a9cfb2b605a1794aea6d717 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= <jp_bruyere@hotmail.com>
Date: Sat, 17 Feb 2018 03:21:30 +0100
Subject: [PATCH] crowIDE wip

---
 CrowIDE/CrowIDE.csproj            |  6 ++---
 CrowIDE/ui/EditPaneItems.template |  2 +-
 CrowIDE/ui/MembersItem.template   | 40 ++++++++++++++++++-------------
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/CrowIDE/CrowIDE.csproj b/CrowIDE/CrowIDE.csproj
index 69e8bf42..44a02a06 100644
--- a/CrowIDE/CrowIDE.csproj
+++ b/CrowIDE/CrowIDE.csproj
@@ -124,9 +124,6 @@
     <EmbeddedResource Include="ui\GTreeExplorer.crow" />
     <EmbeddedResource Include="ui\GTreeExpITemp.crow" />
     <EmbeddedResource Include="ui\MemberView.crow" />
-    <EmbeddedResource Include="ui\MenuItem.template">
-      <LogicalName>Crow.MenuItem.template</LogicalName>
-    </EmbeddedResource>
     <EmbeddedResource Include="ui\CSProjExplorer.crow" />
     <EmbeddedResource Include="ui\ProjectProperties.crow" />
     <EmbeddedResource Include="ui\TreeExpandable.template">
@@ -173,5 +170,8 @@
     <None Include="ui\icons\zoom-in.svg" />
     <None Include="ui\icons\zoom-out.svg" />
     <None Include="ui\icons\basic_floppydisk.svg" />
+    <None Include="ui\MenuItem.template">
+      <LogicalName>Crow.MenuItem.template</LogicalName>
+    </None>
   </ItemGroup>
 </Project>
diff --git a/CrowIDE/ui/EditPaneItems.template b/CrowIDE/ui/EditPaneItems.template
index 08875ce2..5879e2a7 100644
--- a/CrowIDE/ui/EditPaneItems.template
+++ b/CrowIDE/ui/EditPaneItems.template
@@ -45,7 +45,7 @@
 				Name="crowContainer" Background="Onyx"/>
 			<Splitter/>
 			<HorizontalStack Height="Stretched" >
-				<SourceEditor Focusable="true" Name="editor" Font="monospace, 12" VerticalAlignment="Top" Margin="10"
+				<SourceEditor Focusable="true" Name="editor" Font="monospace, 11" VerticalAlignment="Top" Margin="10"
 						Foreground="Jet" Background="White" Width="Stretched" Height="Stretched"
 						 FilePath="{AbsolutePath}"  KeyDown="textView_KeyDown"/>
 				<ScrollBar Name="scrollbarY" Value="{²../editor.ScrollY}"
diff --git a/CrowIDE/ui/MembersItem.template b/CrowIDE/ui/MembersItem.template
index abf8c24c..a3cf670e 100644
--- a/CrowIDE/ui/MembersItem.template
+++ b/CrowIDE/ui/MembersItem.template
@@ -25,16 +25,20 @@
 			<Template>
 				<Popper Name="popper" PopDirection="Bottom">
 					<Template>
-						<Border CornerRadius="0" Foreground="LightGray" Background="White">
-							<HorizontalStack Margin="0" Spacing="1">
-								<Label Width="Stretched" MinimumSize="80,10" Margin="1" Foreground="Black" Background="White"
-									Text="{../../../../SelectedItem}"/>
-								<Button Width="12" Height="12" Focusable="false"
-									Template="#Crow.Templates.ArrowBut.template">
-									<Image Margin="1"  Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
-								</Button>
-							</HorizontalStack>
-						</Border>
+						<CheckBox Caption="{./Caption}" IsChecked="{²./IsPopped}" Foreground="{./Foreground}" Background="{./Background}">
+							<Template>
+								<Border CornerRadius="0" Foreground="LightGray" Background="White">
+									<HorizontalStack Margin="0" Spacing="1">
+										<Label Width="Stretched" MinimumSize="80,10" Margin="1" Foreground="Black" Background="White"
+											Text="{../../../../../SelectedItem}"/>
+										<Button Width="12" Height="12" Focusable="false"
+											Template="#Crow.Templates.ArrowBut.template">
+											<Image Margin="1"  Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+										</Button>
+									</HorizontalStack>
+								</Border>
+							</Template>
+						</CheckBox>
 					</Template>
 					<Border Background="White" BorderWidth="1" Margin="1" Foreground="Black"
 						MinimumSize="{../../MinimumPopupSize}" Fit="true">
@@ -69,12 +73,16 @@
 		<Label Margin="1" Text="{Name}" Height="Fit" Width="50%"/>
 		<Popper Background="White" Margin="0" Height="Stretched" Caption="{Value}">
 			<Template>
-				<HorizontalStack Spacing="3" Height="Fit" Background="{./Background}">
-					<Border Foreground="Black" Width="16" Height="10" CornerRadius="3"
-						Background="{Value}">
-					</Border>
-					<Label Text="{./Caption}" Foreground="Black"/>
-				</HorizontalStack>
+				<CheckBox Caption="{./Caption}" IsChecked="{²./IsPopped}" Foreground="{./Foreground}" Background="{./Background}">
+					<Template>
+						<HorizontalStack Spacing="3" Height="Fit" Background="{./Background}">
+							<Border Foreground="Black" Width="16" Height="10" CornerRadius="3"
+								Background="{Value}">
+							</Border>
+							<Label Text="{./Caption}" Foreground="Black"/>
+						</HorizontalStack>
+					</Template>
+				</CheckBox>
 			</Template>
 			<ColorPicker SelectedColor="{²Value}" Background="Onyx" Margin="5" Fit="True" />
 		</Popper>
-- 
2.47.3