Skip to content

Commit 3a91582

Browse files
committed
update styles
1 parent 9ebc94d commit 3a91582

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/CommandBar/AppBarButton.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ private void UpdateFlyoutState(bool useTransitions = true)
447447

448448
private void UpdatePrimaryLabelState(bool useTransitions = true)
449449
{
450-
bool hasPrimaryLabel = /*Flyout != null &&*/ !string.IsNullOrEmpty(Label as string);
450+
bool hasPrimaryLabel = !IsInOverflow && !string.IsNullOrEmpty(Label as string);
451451
VisualStateManager.GoToState(this, hasPrimaryLabel ? "HasPrimaryLabels" : "NoPrimaryLabels", useTransitions);
452452
}
453453

source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/CommandBarFlyout/CommandBarFlyout.xaml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1131,12 +1131,11 @@
11311131
<Grid>
11321132
<Grid.ColumnDefinitions>
11331133
<ColumnDefinition Width="*" />
1134-
<ColumnDefinition Width="Auto" />
1134+
<ColumnDefinition Width="Auto" MinWidth="3" />
11351135
</Grid.ColumnDefinitions>
11361136
<primitives:CommandBarPanel
11371137
x:Name="PART_ToolBarPanel"
11381138
Grid.Column="0"
1139-
Height="40"
11401139
Margin="3,3,0,3"
11411140
HorizontalAlignment="Left"
11421141
IsItemsHost="true"
@@ -1158,9 +1157,9 @@
11581157
x:Name="EllipsisIcon"
11591158
HorizontalAlignment="Center"
11601159
VerticalAlignment="Center"
1161-
FontFamily="{DynamicResource FluentSystemIcons}"
1160+
FontFamily="{DynamicResource SymbolThemeFontFamily}"
11621161
FontSize="16"
1163-
Glyph="&#xE827;" />
1162+
Glyph="&#xE712;" />
11641163
</ToggleButton>
11651164
</Grid>
11661165
</Border>
@@ -1339,13 +1338,12 @@
13391338
<Setter Property="BorderBrush" Value="{DynamicResource CommandBarFlyoutBorderBrush}" />
13401339
<Setter Property="BorderThickness" Value="{DynamicResource CommandBarFlyoutBorderThemeThickness}" />
13411340
<Setter Property="IsTabStop" Value="False" />
1342-
<Setter Property="VerticalAlignment" Value="Top" />
1341+
<Setter Property="VerticalAlignment" Value="Stretch" />
13431342
<Setter Property="HorizontalAlignment" Value="Left" />
13441343
<Setter Property="HorizontalContentAlignment" Value="Left" />
1345-
<Setter Property="VerticalContentAlignment" Value="Top" />
1344+
<Setter Property="VerticalContentAlignment" Value="Stretch" />
13461345
<Setter Property="DefaultLabelPosition" Value="Collapsed" />
13471346
<Setter Property="MaxWidth" Value="440" />
1348-
<Setter Property="Height" Value="48" />
13491347
<Setter Property="IsDynamicOverflowEnabled" Value="True" />
13501348
<Setter Property="CommandBarOverflowPresenterStyle" Value="{StaticResource CommandBarFlyoutCommandBarOverflowPresenterStyle}" />
13511349
<Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />

source/iNKORE.UI.WPF.Modern/Themes/Controls/CommandBar.xaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,15 @@
8181
<Setter Property="BorderBrush" Value="{DynamicResource CommandBarFlyoutAppBarButtonBorderBrush}" />
8282
<Setter Property="Padding" Value="0" />
8383
<Setter Property="Width" Value="44" />
84-
<Setter Property="Height" Value="40" />
84+
<Setter Property="MinHeight" Value="40" />
85+
<Setter Property="HorizontalAlignment" Value="Stretch" />
8586
<Setter Property="HorizontalContentAlignment" Value="Center" />
87+
<Setter Property="VerticalAlignment" Value="Stretch" />
8688
<Setter Property="VerticalContentAlignment" Value="Center" />
89+
<Setter Property="FontWeight" Value="SemiBold" />
90+
<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
8791
<Setter Property="chelper:FocusVisualHelper.FocusVisualMargin" Value="0" />
92+
<Setter Property="chelper:ControlHelper.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
8893
<Setter Property="Template">
8994
<Setter.Value>
9095
<ControlTemplate TargetType="ToggleButton">

0 commit comments

Comments
 (0)