diff options
| author | jpbruyere <jp.bruyere@hotmail.com> | 2016-02-28 12:32:26 +0100 |
|---|---|---|
| committer | jpbruyere <jp.bruyere@hotmail.com> | 2016-02-28 12:32:26 +0100 |
| commit | 1d5a24313cd20b97bf9a852e30bade904cb4b95c (patch) | |
| tree | 1a6e0cba4b2bf2c0abd6207de15285e5b0c5ce10 | |
| parent | 83ed3394dbf100cc5798acbaf76c6631b36465c5 (diff) | |
debug combobox
| -rwxr-xr-x | Templates/ComboBox.goml | 10 | ||||
| -rwxr-xr-x | Tests/Interfaces/testCombobox.goml | 2 | ||||
| -rw-r--r-- | src/GraphicObjects/ListBox.cs | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Templates/ComboBox.goml b/Templates/ComboBox.goml index 7a735307..e512ef2c 100755 --- a/Templates/ComboBox.goml +++ b/Templates/ComboBox.goml @@ -1,19 +1,19 @@ <?xml version="1.0"?> <Popper Name="popper" PopDirection="Bottom" Height="{../HeightPolicy}" Width="{../WidthPolicy}"> <Template> - <Border CornerRadius="0" Foreground="LightGray" Height="{../HeightPolicy}" Width="{../WidthPolicy}"> - <HorizontalStack Margin="1" Spacing="1" Height="{../../HeightPolicy}" Width="{../../WidthPolicy}"> + <Border CornerRadius="0" Foreground="LightGray" Height="{../../HeightPolicy}" Width="{../../WidthPolicy}"> + <HorizontalStack Margin="1" Spacing="1" Height="{../../../HeightPolicy}" Width="{../../../WidthPolicy}"> <TextBox MinimumSize="80;10" Margin="1" Foreground="Black" Background="White" - Text="{../../../../SelectedItem}" Focusable="true" + Text="{../../../../SelectedItem}" Height="{../../../../HeightPolicy}" Width="{../../../../WidthPolicy}"/> - <Button Width="14" Height="14" MouseClick="../../../onMouseClick" + <Button Width="14" Height="14" Focusable="false" Template="#Crow.Templates.ArrowButTemplate.crow"> <Image Margin="0" Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/> </Button> </HorizontalStack> </Border> </Template> - <Border Background="DimGray" BorderWidth="1" Margin="1" MinimumSize="100;100" MaximumSize="200;300" Height="-1" Width="-1"> + <Border Background="DimGray" BorderWidth="1" Margin="1" MinimumSize="100;100" MaximumSize="200;400" Height="-1" Width="-1"> <Scroller Name="scroller1" Margin="1" VerticalScrolling="true" Height="200" Width="-1" ValueChanged="../../../_scroller_ValueChanged"> diff --git a/Tests/Interfaces/testCombobox.goml b/Tests/Interfaces/testCombobox.goml index d12a333d..8e0b16ad 100755 --- a/Tests/Interfaces/testCombobox.goml +++ b/Tests/Interfaces/testCombobox.goml @@ -1,5 +1,5 @@ <?xml version="1.0"?> <VerticalStack> - <ComboBox Width="120" Data="{TestList}" SelectedItem="Blue" + <ComboBox Width="120" Data="{TestList}" SelectedIndex="0" ItemTemplate="#Tests.Interfaces.colorItem.crow"/> </VerticalStack>
\ No newline at end of file diff --git a/src/GraphicObjects/ListBox.cs b/src/GraphicObjects/ListBox.cs index 0d80479a..0a9c0c77 100644 --- a/src/GraphicObjects/ListBox.cs +++ b/src/GraphicObjects/ListBox.cs @@ -93,7 +93,7 @@ namespace Crow } } public object SelectedItem{ - get { return data == null ? null : _selectedIndex < 0 ? null : data[_selectedIndex]; } + get { return data == null ? "" : _selectedIndex < 0 ? "" : data[_selectedIndex]; } } [XmlAttributeAttribute]//[DefaultValue(null)] public IList Data { |