Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port microsoft/microsoft-ui-xaml#4615 #616

Merged
merged 1 commit into from
Nov 18, 2023
Merged

Port microsoft/microsoft-ui-xaml#4615 #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ModernWpf.Controls/CommandBar/CommandBar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
<Style TargetType="local:CommandBar">
<Setter Property="Background" Value="{DynamicResource CommandBarBackground}" />
<Setter Property="Foreground" Value="{DynamicResource CommandBarForeground}" />
<Setter Property="Padding" Value="9,0,0,0" />
<Setter Property="Padding" Value="4,0,0,0" />
<Setter Property="IsTabStop" Value="False" />
<Setter Property="VerticalAlignment" Value="Top" />
<Setter Property="HorizontalAlignment" Value="Stretch" />
Expand Down
8 changes: 4 additions & 4 deletions ModernWpf/Styles/CommandBar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
<sys:Double x:Key="AppBarButtonContentHeight">16</sys:Double>
<sys:Double x:Key="AppBarThemeMinHeight">64</sys:Double>
<sys:Double x:Key="AppBarThemeCompactHeight">48</sys:Double>
<Thickness x:Key="AppBarEllipsisButtonInnerBorderMargin">0,9,9,9</Thickness>
<Thickness x:Key="AppBarEllipsisButtonInnerBorderMargin">2,6,6,6</Thickness>

<Thickness x:Key="AppBarButtonContentViewboxMargin">12,16,0,10</Thickness>
<Thickness x:Key="AppBarButtonContentViewboxCompactMargin">0,12,0,12</Thickness>
<Thickness x:Key="AppBarButtonContentViewboxCollapsedMargin">0,16,0,4</Thickness>
<Thickness x:Key="AppBarButtonContentViewboxCollapsedMargin">0,16,0,2</Thickness>
<Thickness x:Key="AppBarButtonOverflowTextTouchMargin">0,9,0,12</Thickness>
<Thickness x:Key="AppBarButtonOverflowTextLabelPadding">0,5,0,8</Thickness>
<Thickness x:Key="AppBarButtonTextLabelMargin">2,0,2,8</Thickness>
<Thickness x:Key="AppBarButtonTextLabelOnRightMargin">8,16,12,10</Thickness>
<Thickness x:Key="AppBarButtonInnerBorderMargin">0,9,0,9</Thickness>
<Thickness x:Key="AppBarButtonInnerBorderCompactMargin">0,9,0,25</Thickness>
<Thickness x:Key="AppBarButtonInnerBorderMargin">2,6,2,6</Thickness>
<Thickness x:Key="AppBarButtonInnerBorderCompactMargin">2,6,2,22</Thickness>
<Thickness x:Key="AppBarButtonInnerBorderOverflowMargin">4,0,4,0</Thickness>

<Thickness x:Key="AppBarToggleButtonOverflowTextTouchMargin">0,9,0,12</Thickness>
Expand Down
2 changes: 1 addition & 1 deletion test/ModernWpfTestApp/CommandBarPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<AppBarButton Icon="Add" Label="Add"/>
<AppBarButton Icon="Remove" Label="Remove" LabelPosition="Collapsed"/>
<AppBarSeparator/>
<AppBarButton Icon="Save" Label="Save"/>
<AppBarButton Icon="Save" Label="Save And Quit"/>
<AppBarToggleButton Icon="Add" Label="Toggle"/>
<CommandBar.SecondaryCommands>
<AppBarButton Icon="Add" Label="Add"/>
Expand Down
Loading