From 94ad875ff28df520266e0680ee1927e199235837 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:20:18 +0100
Subject: [PATCH] styling, checkbox used in popper

---
 Default.style                  | 24 ++++++++++++++++++------
 Templates/Expandable.template  |  4 ++--
 Templates/MenuItem.template    | 30 +++++++++++++++++-------------
 Templates/Popper.template      | 20 +++++++++++++-------
 Tests/Interfaces/Divers/0.crow |  4 ++--
 5 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/Default.style b/Default.style
index 4eaabf4c..887ecc9f 100644
--- a/Default.style
+++ b/Default.style
@@ -9,8 +9,25 @@ Border {
 CheckBox { Caption = CheckBox; }
 RadioButton { Caption = RadioButton; }
 Expandable { Caption = Expandable; }
-Popper { Caption = Popper; }
+Popper { Caption = Popper;}
 GroupBox { Caption = Group Box; }
+
+ControlBorder {
+	BorderWidth	= 1;
+	Foreground  = Jet;
+	Background	= Transparent;
+}
+ControlCaption {
+	Foreground  = Gray;
+	MouseEnter	= {Foreground=White};
+	MouseLeave	= {Foreground=Gray};
+}
+Icon {
+	Margin=1;
+	Width=12;
+	Height=12;
+}
+
 Wrapper {
 	Orientation = Vertical;
 }
@@ -116,11 +133,6 @@ ScrollBar {
 Scroller {
 	CacheEnabled = false;
 }
-Icon {
-	Margin=1;
-	Width=12;
-	Height=12;
-}
 Control {
 	Margin=0;
 	Spacing=3;
diff --git a/Templates/Expandable.template b/Templates/Expandable.template
index 610caf5c..c5dd1d83 100755
--- a/Templates/Expandable.template
+++ b/Templates/Expandable.template
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Border BorderWidth="1" Foreground="{./Foreground}" Background="{./Background}">
+<Border Style="ControlBorder" Foreground="{./Foreground}" Background="{./Background}">
 	<VerticalStack>
 		<HorizontalStack Spacing="1" Height="Fit" MouseDoubleClick="./onClickForExpand">
 			<Container Margin="1" Width="9" Height="9" Focusable="true" MouseClick="./onClickForExpand"
@@ -10,7 +10,7 @@
 					Visible="{./IsExpandable}"
 					SvgSub="{./IsExpanded}"/>
 			</Container>
-			<Label Text="{./Caption}"/>
+			<Label Style="ControlCaption" Text="{./Caption}"/>
 		</HorizontalStack>
 		<Container Name="Content" Visible="false"/>
 	</VerticalStack>
diff --git a/Templates/MenuItem.template b/Templates/MenuItem.template
index 511c5265..57014577 100644
--- a/Templates/MenuItem.template
+++ b/Templates/MenuItem.template
@@ -3,19 +3,23 @@
 	Foreground = "{./Foreground}" CanPop="{./HasChildren}" MouseClick="./onMI_Click"
 	IsPopped="{²./IsOpened}" PopWidth="{./PopWidth}" PopHeight="{./PopHeight}">
 	<Template>
-		<Border Name="border1"
-				MouseEnter="{Foreground=vgradient|0:White|0.2:Gray|0.9:Gray|1:Black}"
-				MouseLeave="{Foreground=Transparent}"
-				MouseDown="{Foreground=vgradient|0:Black|0.05:Gray|0.85:Gray|1:White}"
-				MouseUp="{Foreground=vgradient|0:White|0.2:Gray|0.9:Gray|1:Black}"
-				MinimumSize = "60,0"
-				Foreground="Transparent"
-				Background="{./Background}">
-				<Label Text="{./Caption}"
-					Foreground="{./Foreground}"
-					Margin="2" HorizontalAlignment="Left"
-					Font="{./Font}"	/>
-		</Border>
+		<CheckBox IsChecked="{²./IsPopped}" Caption="{./Caption}" Background="{./Background}" Foreground="{./Foreground}">
+			<Template>		
+				<Border Name="border1"
+						MouseEnter="{Foreground=vgradient|0:White|0.2:Gray|0.9:Gray|1:Black}"
+						MouseLeave="{Foreground=Transparent}"
+						MouseDown="{Foreground=vgradient|0:Black|0.05:Gray|0.85:Gray|1:White}"
+						MouseUp="{Foreground=vgradient|0:White|0.2:Gray|0.9:Gray|1:Black}"
+						MinimumSize = "60,0"
+						Foreground="Transparent"
+						Background="{./Background}">
+						<Label Text="{./Caption}"
+							Foreground="{./Foreground}"
+							Margin="2" HorizontalAlignment="Left"
+							Font="{./Font}"	/>
+				</Border>
+			</Template>		
+		</CheckBox>
 	</Template>
 	<Border Foreground="DimGray" Width="{../PopWidth}" Height="{../PopHeight}" Background="Onyx">
 		<VerticalStack Name="ItemsContainer"/>
diff --git a/Templates/Popper.template b/Templates/Popper.template
index 0bc7c741..78a60842 100755
--- a/Templates/Popper.template
+++ b/Templates/Popper.template
@@ -1,8 +1,14 @@
 <?xml version="1.0"?>
-<Border Background="{./Background}" BorderWidth="1" Foreground="{./Foreground}" Height="Fit">
-	<HorizontalStack Spacing="1" Height="Fit">
-		<Image Style="Icon" Margin="1" Width="9" Height="9"
-				Path="#Crow.Images.Icons.expandable.svg" SvgSub="{./IsPopped}"/>
-		<Label Text="{./Caption}" />
-	</HorizontalStack>
-</Border>
\ No newline at end of file
+<CheckBox Caption="{./Caption}" IsChecked="{²./IsPopped}" Foreground="{./Foreground}" Background="{./Background}">
+	<Template>
+		<Border Style="ControlBorder" Foreground="{./Foreground}" Background="{./Background}">
+			<HorizontalStack Spacing="1">
+				<Image Style="Icon" Margin="1" Width="9" Height="9"	
+					MouseEnter="{Background=White}" MouseLeave="{Background=Transparent}"
+					Background="{./Background}"
+					Path="#Crow.Images.Icons.expandable.svg" SvgSub="{./IsChecked}"/>
+				<Label Style="ControlCaption" Text="{./Caption}" />
+			</HorizontalStack>
+		</Border>
+	</Template>
+</CheckBox>
diff --git a/Tests/Interfaces/Divers/0.crow b/Tests/Interfaces/Divers/0.crow
index dbb1420d..42900792 100755
--- a/Tests/Interfaces/Divers/0.crow
+++ b/Tests/Interfaces/Divers/0.crow
@@ -96,10 +96,10 @@
 		</VerticalStack>
 		<Splitter/>
 		<VerticalStack Width="40%" Margin="5" Spacing="5">
-			<Expandable Background="DimGray">
+			<Expandable>
 				<Image Path="#Crow.Images.Icons.crow.svg"/>
 			</Expandable>
-			<Popper Background="DimGray" >
+			<Popper>
 				<Border Fit="True" Background="DimGray" CornerRadius="0" BorderWidth="1">
 					<Image Path="#Crow.Images.Icons.crow.svg" Width="100" Height="100" Margin="10"
 						MouseEnter="{Background=LightGray}"
-- 
2.47.3