fixed #456
This commit is contained in:
1 parent
52a1470640
commit
c2c6dbe490
5 files changed
+40
-29
No files matched your search
@@ -40,12 +40,12 @@
|
|||||||
</Setter>
|
</Setter>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style x:Key="CheckComboBoxWatermarkToggleButton" TargetType="ToggleButton">
|
<Style x:Key="CheckComboBoxToggleButton" BasedOn="{StaticResource ComboBoxToggleButton}" TargetType="ToggleButton">
|
||||||
<Setter Property="OverridesDefaultStyle" Value="true"/>
|
<Setter Property="ClickMode" Value="Release"/>
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}"/>
|
</Style>
|
||||||
<Setter Property="IsTabStop" Value="false"/>
|
|
||||||
<Setter Property="Focusable" Value="false"/>
|
<Style x:Key="CheckComboBoxWatermarkToggleButton" BasedOn="{StaticResource ComboBoxWatermarkToggleButton}" TargetType="ToggleButton">
|
||||||
<Setter Property="ClickMode" Value="Press"/>
|
<Setter Property="ClickMode" Value="Release"/>
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
<ControlTemplate TargetType="ToggleButton">
|
<ControlTemplate TargetType="ToggleButton">
|
||||||
@@ -126,7 +126,7 @@
|
|||||||
</hc:ToggleBlock>
|
</hc:ToggleBlock>
|
||||||
</Border>
|
</Border>
|
||||||
</Popup>
|
</Popup>
|
||||||
<ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Style="{StaticResource ComboBoxToggleButton}"/>
|
<ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Style="{StaticResource CheckComboBoxToggleButton}"/>
|
||||||
<Border Grid.Column="0" Margin="-1,1">
|
<Border Grid.Column="0" Margin="-1,1">
|
||||||
<WrapPanel Name="PART_Panel" Margin="5,0,5,3"/>
|
<WrapPanel Name="PART_Panel" Margin="5,0,5,3"/>
|
||||||
</Border>
|
</Border>
|
||||||
|
|||||||
@@ -6733,12 +6733,11 @@
|
|||||||
</Setter.Value>
|
</Setter.Value>
|
||||||
</Setter>
|
</Setter>
|
||||||
</Style>
|
</Style>
|
||||||
<Style x:Key="CheckComboBoxWatermarkToggleButton" TargetType="ToggleButton">
|
<Style x:Key="CheckComboBoxToggleButton" BasedOn="{StaticResource ComboBoxToggleButton}" TargetType="ToggleButton">
|
||||||
<Setter Property="OverridesDefaultStyle" Value="true" />
|
<Setter Property="ClickMode" Value="Release" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}" />
|
</Style>
|
||||||
<Setter Property="IsTabStop" Value="false" />
|
<Style x:Key="CheckComboBoxWatermarkToggleButton" BasedOn="{StaticResource ComboBoxWatermarkToggleButton}" TargetType="ToggleButton">
|
||||||
<Setter Property="Focusable" Value="false" />
|
<Setter Property="ClickMode" Value="Release" />
|
||||||
<Setter Property="ClickMode" Value="Press" />
|
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
<ControlTemplate TargetType="ToggleButton">
|
<ControlTemplate TargetType="ToggleButton">
|
||||||
@@ -6817,7 +6816,7 @@
|
|||||||
</hc:ToggleBlock>
|
</hc:ToggleBlock>
|
||||||
</Border>
|
</Border>
|
||||||
</Popup>
|
</Popup>
|
||||||
<ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Style="{StaticResource ComboBoxToggleButton}" />
|
<ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Style="{StaticResource CheckComboBoxToggleButton}" />
|
||||||
<Border Grid.Column="0" Margin="-1,1">
|
<Border Grid.Column="0" Margin="-1,1">
|
||||||
<WrapPanel Name="PART_Panel" Margin="5,0,5,3" />
|
<WrapPanel Name="PART_Panel" Margin="5,0,5,3" />
|
||||||
</Border>
|
</Border>
|
||||||
|
|||||||
@@ -74,7 +74,20 @@ namespace HandyControl.Controls
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register(
|
public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register(
|
||||||
"IsDropDownOpen", typeof(bool), typeof(CheckComboBox), new PropertyMetadata(ValueBoxes.FalseBox));
|
"IsDropDownOpen", typeof(bool), typeof(CheckComboBox), new PropertyMetadata(ValueBoxes.FalseBox, OnIsDropDownOpenChanged));
|
||||||
|
|
||||||
|
private static void OnIsDropDownOpenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||||
|
{
|
||||||
|
var ctl = (CheckComboBox) d;
|
||||||
|
|
||||||
|
if (!(bool) e.NewValue)
|
||||||
|
{
|
||||||
|
ctl.Dispatcher.BeginInvoke(new Action(() =>
|
||||||
|
{
|
||||||
|
Mouse.Capture(null);
|
||||||
|
}), DispatcherPriority.Send);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public bool IsDropDownOpen
|
public bool IsDropDownOpen
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -40,12 +40,12 @@
|
|||||||
</Setter>
|
</Setter>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style x:Key="CheckComboBoxWatermarkToggleButton" TargetType="ToggleButton">
|
<Style x:Key="CheckComboBoxToggleButton" BasedOn="{StaticResource ComboBoxToggleButton}" TargetType="ToggleButton">
|
||||||
<Setter Property="OverridesDefaultStyle" Value="true"/>
|
<Setter Property="ClickMode" Value="Release"/>
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}"/>
|
</Style>
|
||||||
<Setter Property="IsTabStop" Value="false"/>
|
|
||||||
<Setter Property="Focusable" Value="false"/>
|
<Style x:Key="CheckComboBoxWatermarkToggleButton" BasedOn="{StaticResource ComboBoxWatermarkToggleButton}" TargetType="ToggleButton">
|
||||||
<Setter Property="ClickMode" Value="Press"/>
|
<Setter Property="ClickMode" Value="Release"/>
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
<ControlTemplate TargetType="ToggleButton">
|
<ControlTemplate TargetType="ToggleButton">
|
||||||
@@ -126,7 +126,7 @@
|
|||||||
</hc:ToggleBlock>
|
</hc:ToggleBlock>
|
||||||
</Border>
|
</Border>
|
||||||
</Popup>
|
</Popup>
|
||||||
<ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Style="{StaticResource ComboBoxToggleButton}"/>
|
<ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Style="{StaticResource CheckComboBoxToggleButton}"/>
|
||||||
<Border Grid.Column="0" Margin="-1,1">
|
<Border Grid.Column="0" Margin="-1,1">
|
||||||
<WrapPanel Name="PART_Panel" Margin="5,0,5,3"/>
|
<WrapPanel Name="PART_Panel" Margin="5,0,5,3"/>
|
||||||
</Border>
|
</Border>
|
||||||
|
|||||||
@@ -6816,12 +6816,11 @@
|
|||||||
</Setter.Value>
|
</Setter.Value>
|
||||||
</Setter>
|
</Setter>
|
||||||
</Style>
|
</Style>
|
||||||
<Style x:Key="CheckComboBoxWatermarkToggleButton" TargetType="ToggleButton">
|
<Style x:Key="CheckComboBoxToggleButton" BasedOn="{StaticResource ComboBoxToggleButton}" TargetType="ToggleButton">
|
||||||
<Setter Property="OverridesDefaultStyle" Value="true" />
|
<Setter Property="ClickMode" Value="Release" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}" />
|
</Style>
|
||||||
<Setter Property="IsTabStop" Value="false" />
|
<Style x:Key="CheckComboBoxWatermarkToggleButton" BasedOn="{StaticResource ComboBoxWatermarkToggleButton}" TargetType="ToggleButton">
|
||||||
<Setter Property="Focusable" Value="false" />
|
<Setter Property="ClickMode" Value="Release" />
|
||||||
<Setter Property="ClickMode" Value="Press" />
|
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
<ControlTemplate TargetType="ToggleButton">
|
<ControlTemplate TargetType="ToggleButton">
|
||||||
@@ -6900,7 +6899,7 @@
|
|||||||
</hc:ToggleBlock>
|
</hc:ToggleBlock>
|
||||||
</Border>
|
</Border>
|
||||||
</Popup>
|
</Popup>
|
||||||
<ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Style="{StaticResource ComboBoxToggleButton}" />
|
<ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Style="{StaticResource CheckComboBoxToggleButton}" />
|
||||||
<Border Grid.Column="0" Margin="-1,1">
|
<Border Grid.Column="0" Margin="-1,1">
|
||||||
<WrapPanel Name="PART_Panel" Margin="5,0,5,3" />
|
<WrapPanel Name="PART_Panel" Margin="5,0,5,3" />
|
||||||
</Border>
|
</Border>
|
||||||
|
|||||||
Reference in new issue
Block a user