first test with color in property tab from CrowIDE

	modifié :         CrowIDE/ui/imlEditor.crow
	modifié :         Templates/ColorPicker.template
	modifié :         Tests/Interfaces/Divers/colorPicker.crow
	modifié :         src/GraphicObjects/ColorPicker.cs
	modifié :         src/GraphicObjects/ColorSelector.cs

diff --git a/CrowIDE/ui/imlEditor.crow b/CrowIDE/ui/imlEditor.crow
index 984394f6f753971916a85db540b3368b0118c004..d84fa6a8701f3387053ec6e9d5e2f3169a11f45a 100644 (file)
--- a/CrowIDE/ui/imlEditor.crow
+++ b/CrowIDE/ui/imlEditor.crow
@@ -72,7 +72,7 @@
                                                <CheckBox Background="White" Margin="1" Caption="" IsChecked="{²Value}"/>
                                        </HorizontalStack>
                                </ItemTemplate>
--                              <ItemTemplate DataType="System.Enum">
+                               <ItemTemplate DataType="System.Enum">
                                        <HorizontalStack Focusable="true"  Height="Fit" Spacing="0"
                                                        MouseEnter="{Background=UnitedNationsBlue}"
                                                        MouseLeave="{Background=Transparent}" >
@@ -119,6 +119,25 @@
                                                </ComboBox>
                                        </HorizontalStack>
                                </ItemTemplate>
+                               <ItemTemplate DataType="Crow.Fill">
+                                       <HorizontalStack Focusable="true"  Height="Fit" Spacing="0"
+                                                       MouseEnter="{Background=UnitedNationsBlue}"
+                                                       MouseLeave="{Background=Transparent}" >
+                                               <Label Margin="1" Text="{Name}" Height="Fit" Width="50%"/>
+                                               <Popper Foreground="{²Value}" Background="White" Margin="1" Caption="{²Value}">
+                                                       <Template>
+                                                               <HorizontalStack Spacing="3" Height="Fit" Background="{./Background}">
+                                                                       <Border Foreground="Black" Width="16" Height="10" CornerRadius="3"
+                                                                               Background="{./Foreground}">
+                                                                       </Border>
+                                                                       <Label Text="{./Caption}" Foreground="Black"/>
+                                                               </HorizontalStack>
+                                                       </Template>
+                                                       <ColorPicker SelectedColor="{²Value}" Background="Onyx" Margin="5" Fit="True" />
+                                               </Popper>
+                                       </HorizontalStack>
+                               </ItemTemplate>
+
                        </MembersView>
                </HorizontalStack>
        </VerticalStack>

diff --git a/Templates/ColorPicker.template b/Templates/ColorPicker.template
index 06753f80d33488974b5c95377ff9c32a6c52376c..4a542631848b00ef874c6fa0830b735a1de4054e 100755 (executable)
--- a/Templates/ColorPicker.template
+++ b/Templates/ColorPicker.template
@@ -4,6 +4,7 @@
                <HorizontalStack Spacing="0">
                        <VerticalStack Margin="10">
                                <SaturationValueSelector Focusable="true" Name="colorSelector" Margin="0" Width="140" Height="140" Background="DimGray"
+                                       SelectedColor="{²./SelectedColor}"
                                        Foreground="{../hueSelector.SelectedColor}"/>
                                <HueSelector Focusable="true" Name="hueSelector" Margin="0" Width="140" Height="20" Background="DimGray"/>
                        </VerticalStack>

diff --git a/Tests/Interfaces/Divers/colorPicker.crow b/Tests/Interfaces/Divers/colorPicker.crow
index 724ca4db3d0365f1aa69bdb2bbbb7c19a886c021..add58965897d91f7fc7d5553b77cfe41bb5c5abe 100755 (executable)
--- a/Tests/Interfaces/Divers/colorPicker.crow
+++ b/Tests/Interfaces/Divers/colorPicker.crow
@@ -1,2 +1,5 @@
 <?xml version="1.0"?>
-<ColorPicker Background="Onyx" Margin="5" Fit="True" Foreground="White"/>
\ No newline at end of file
+<VerticalStack>
+       <ColorPicker SelectedColor="Red" Name="colorPicker" Background="Onyx" Margin="5" Fit="True" />
+       <GraphicObject Width="100" Height="60" Background="{../colorPicker.SelectedColor}"/>
+</VerticalStack>
\ No newline at end of file

diff --git a/src/GraphicObjects/ColorPicker.cs b/src/GraphicObjects/ColorPicker.cs
index 1272914402aef587b7595dca96fc67e36f042901..b95fb0e3e54a2e859277f26ff0710abb1479d790 100644 (file)
--- a/src/GraphicObjects/ColorPicker.cs
+++ b/src/GraphicObjects/ColorPicker.cs
@@ -30,65 +30,16 @@ namespace Crow
                {
                }
 
-               Color selectedColor;
-               float _red, _green, _blue, _alpha;
+               Fill selectedColor;
 
-               [XmlAttributeAttribute()]
-               public virtual double Red {
-                       get { return selectedColor.R; }
-                       set {
-                               if (selectedColor.R == value)
-                                       return;
-                               selectedColor.R = value; 
-                               NotifyValueChanged ("Red", selectedColor.R);
-                               NotifyValueChanged ("SelectedColor", new SolidColor(selectedColor));
-                       }
-               }
-               [XmlAttributeAttribute()]
-               public virtual double Green {
-                       get { return selectedColor.G; }
-                       set {
-                               if (selectedColor.G == value)
-                                       return;
-                               selectedColor.G = value;
-                               NotifyValueChanged ("Green", selectedColor.G);
-                               NotifyValueChanged ("SelectedColor", new SolidColor(selectedColor));
-                       }
-               }
-               [XmlAttributeAttribute()]
-               public virtual double Blue {
-                       get { return selectedColor.B; }
-                       set {
-                               if (selectedColor.B == value)
-                                       return;
-                               selectedColor.B = value;
-                               NotifyValueChanged ("Blue", selectedColor.B);
-                               NotifyValueChanged ("SelectedColor", new SolidColor(selectedColor));
-                       }
-               }
-               [XmlAttributeAttribute()]
-               public virtual double Alpha {
-                       get { return selectedColor.A; }
-                       set {
-                               if (selectedColor.A == value)
-                                       return;
-                               selectedColor.A = value;
-                               NotifyValueChanged ("Alpha", selectedColor.A);
-                               NotifyValueChanged ("SelectedColor", new SolidColor(selectedColor));
-                       }
-               }
-               [XmlAttributeAttribute()][DefaultValue("White")]
-               public virtual SolidColor SelectedColor {
+               [XmlAttributeAttribute]
+               public virtual Fill SelectedColor {
                        get { return selectedColor; }
-                       set {                           
-                               if (selectedColor.Equals(value))
+                       set {
+                               if (selectedColor == value)
                                        return;
-                               selectedColor = value; 
-                               NotifyValueChanged ("SelectedColor", new SolidColor(selectedColor));
-                               NotifyValueChanged ("Alpha", selectedColor.A);
-                               NotifyValueChanged ("Blue", selectedColor.B);
-                               NotifyValueChanged ("Green", selectedColor.G);
-                               NotifyValueChanged ("Red", selectedColor.R);
+                               selectedColor = value;
+                               NotifyValueChanged ("SelectedColor", selectedColor);
                        }
                }
        }

diff --git a/src/GraphicObjects/ColorSelector.cs b/src/GraphicObjects/ColorSelector.cs
index 6db139a53fb6ab5e051d8d62b4a13c85286d1ec7..39db4f251041298f8796d93342e8a9fa56959cb8 100644 (file)
--- a/src/GraphicObjects/ColorSelector.cs
+++ b/src/GraphicObjects/ColorSelector.cs
@@ -33,7 +33,7 @@ namespace Crow
                const double div = 255.0;
                const double colDiv = 1.0 / div;
 
-               Fill selectedColor;
+               Fill selectedColor = new SolidColor(Color.Red);
                protected Point mousePos;
                double h,s,v;
 
@@ -119,7 +119,7 @@ namespace Crow
                        }
                }
 
-               [XmlAttributeAttribute()][DefaultValue("White")]
+               [XmlAttributeAttribute]
                public virtual Fill SelectedColor {
                        get { return selectedColor; }
                        set {