Skip to content

Commit 63acdfc

Browse files
NaBianNaBian
committed
fixed #787 
1 parent 3719b59 commit 63acdfc

3 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎src/Net_40/HandyControl_Net_40/Themes/Theme.xaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8261,7 +8261,7 @@
82618261
<ControlTemplate x:Key="ExpanderLeftTemplate" TargetType="Expander">
82628262
<Grid>
82638263
<Grid.ColumnDefinitions>
8264-
<ColumnDefinition Width="Auto" />
8264+
<ColumnDefinition />
82658265
<ColumnDefinition Width="Auto" />
82668266
</Grid.ColumnDefinitions>
82678267
<Border x:Name="BorderHeader" Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
@@ -8297,7 +8297,7 @@
82978297
<ControlTemplate x:Key="ExpanderUpTemplate" TargetType="Expander">
82988298
<Grid>
82998299
<Grid.RowDefinitions>
8300-
<RowDefinition Height="Auto" />
8300+
<RowDefinition />
83018301
<RowDefinition Height="Auto" />
83028302
</Grid.RowDefinitions>
83038303
<Border x:Name="BorderHeader" Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
@@ -8329,7 +8329,7 @@
83298329
<Grid>
83308330
<Grid.ColumnDefinitions>
83318331
<ColumnDefinition Width="Auto" />
8332-
<ColumnDefinition Width="Auto" />
8332+
<ColumnDefinition />
83338333
</Grid.ColumnDefinitions>
83348334
<Border x:Name="BorderHeader" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
83358335
<ToggleButton VerticalAlignment="Stretch" VerticalContentAlignment="Stretch" Focusable="False" Padding="0,0,0,10" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" MinWidth="{TemplateBinding MinWidth}" Style="{StaticResource ToggleButtonCustom}">
@@ -8365,7 +8365,7 @@
83658365
<Grid>
83668366
<Grid.RowDefinitions>
83678367
<RowDefinition Height="Auto" />
8368-
<RowDefinition Height="Auto" />
8368+
<RowDefinition />
83698369
</Grid.RowDefinitions>
83708370
<Border x:Name="BorderHeader" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
83718371
<ToggleButton HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Focusable="False" Padding="10,0,0,0" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Width="{TemplateBinding Width}" Height="{TemplateBinding MinHeight}" Style="{StaticResource ToggleButtonCustom}">

‎src/Shared/HandyControl_Shared/Themes/Styles/Base/ExpanderBaseStyle.xaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<ControlTemplate x:Key="ExpanderLeftTemplate" TargetType="Expander">
1313
<Grid>
1414
<Grid.ColumnDefinitions>
15-
<ColumnDefinition Width="Auto"/>
15+
<ColumnDefinition/>
1616
<ColumnDefinition Width="Auto"/>
1717
</Grid.ColumnDefinitions>
1818
<Border x:Name="BorderHeader" Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
@@ -49,7 +49,7 @@
4949
<ControlTemplate x:Key="ExpanderUpTemplate" TargetType="Expander">
5050
<Grid>
5151
<Grid.RowDefinitions>
52-
<RowDefinition Height="Auto" />
52+
<RowDefinition/>
5353
<RowDefinition Height="Auto" />
5454
</Grid.RowDefinitions>
5555
<Border x:Name="BorderHeader" Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
@@ -82,7 +82,7 @@
8282
<Grid>
8383
<Grid.ColumnDefinitions>
8484
<ColumnDefinition Width="Auto"/>
85-
<ColumnDefinition Width="Auto"/>
85+
<ColumnDefinition/>
8686
</Grid.ColumnDefinitions>
8787
<Border x:Name="BorderHeader" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
8888
<ToggleButton VerticalAlignment="Stretch" VerticalContentAlignment="Stretch" Focusable="False" Padding="0,0,0,10" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" MinWidth="{TemplateBinding MinWidth}" Style="{StaticResource ToggleButtonCustom}">
@@ -119,7 +119,7 @@
119119
<Grid>
120120
<Grid.RowDefinitions>
121121
<RowDefinition Height="Auto" />
122-
<RowDefinition Height="Auto" />
122+
<RowDefinition/>
123123
</Grid.RowDefinitions>
124124
<Border x:Name="BorderHeader" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
125125
<ToggleButton HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Focusable="False" Padding="10,0,0,0" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Width="{TemplateBinding Width}" Height="{TemplateBinding MinHeight}" Style="{StaticResource ToggleButtonCustom}">

‎src/Shared/HandyControl_Shared/Themes/Theme.xaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8379,7 +8379,7 @@
83798379
<ControlTemplate x:Key="ExpanderLeftTemplate" TargetType="Expander">
83808380
<Grid>
83818381
<Grid.ColumnDefinitions>
8382-
<ColumnDefinition Width="Auto" />
8382+
<ColumnDefinition />
83838383
<ColumnDefinition Width="Auto" />
83848384
</Grid.ColumnDefinitions>
83858385
<Border x:Name="BorderHeader" Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
@@ -8415,7 +8415,7 @@
84158415
<ControlTemplate x:Key="ExpanderUpTemplate" TargetType="Expander">
84168416
<Grid>
84178417
<Grid.RowDefinitions>
8418-
<RowDefinition Height="Auto" />
8418+
<RowDefinition />
84198419
<RowDefinition Height="Auto" />
84208420
</Grid.RowDefinitions>
84218421
<Border x:Name="BorderHeader" Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
@@ -8447,7 +8447,7 @@
84478447
<Grid>
84488448
<Grid.ColumnDefinitions>
84498449
<ColumnDefinition Width="Auto" />
8450-
<ColumnDefinition Width="Auto" />
8450+
<ColumnDefinition />
84518451
</Grid.ColumnDefinitions>
84528452
<Border x:Name="BorderHeader" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
84538453
<ToggleButton VerticalAlignment="Stretch" VerticalContentAlignment="Stretch" Focusable="False" Padding="0,0,0,10" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" MinWidth="{TemplateBinding MinWidth}" Style="{StaticResource ToggleButtonCustom}">
@@ -8483,7 +8483,7 @@
84838483
<Grid>
84848484
<Grid.RowDefinitions>
84858485
<RowDefinition Height="Auto" />
8486-
<RowDefinition Height="Auto" />
8486+
<RowDefinition />
84878487
</Grid.RowDefinitions>
84888488
<Border x:Name="BorderHeader" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
84898489
<ToggleButton HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Focusable="False" Padding="10,0,0,0" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Width="{TemplateBinding Width}" Height="{TemplateBinding MinHeight}" Style="{StaticResource ToggleButtonCustom}">

0 commit comments

Comments
 (0)