Skip to content

Commit 002a55e

Browse files
authored
fix: Properly apply Padding on NavigationBar's CommandBar (#186)
1 parent 7f93c47 commit 002a55e

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

.mergify.yml

-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ pull_request_rules:
2727
actions:
2828
merge:
2929
method: merge
30-
# https://doc.mergify.io/strict-workflow.html
31-
# https://doc.mergify.io/actions.html#label
32-
strict: smart
3330

3431
- name: automatic merge for allcontributors pull requests
3532
conditions:

src/Uno.Toolkit.UI/Controls/NavigationBar/NavigationBar.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1307,6 +1307,7 @@
13071307
Width="Auto" />
13081308
</Grid.ColumnDefinitions>
13091309
<ContentPresenter x:Name="MainCommandPresenter"
1310+
Margin="{TemplateBinding Padding}"
13101311
Content="{Binding Path=(utu:CommandBarExtensions.MainCommand), RelativeSource={RelativeSource TemplatedParent}}" />
13111312

13121313
<!--
@@ -1316,7 +1317,6 @@
13161317

13171318
<ContentControl x:Name="ContentControl"
13181319
Grid.Column="1"
1319-
Margin="{TemplateBinding Padding}"
13201320
Content="{TemplateBinding Content}"
13211321
ContentTemplate="{TemplateBinding ContentTemplate}"
13221322
ContentTransitions="{TemplateBinding ContentTransitions}"

src/library/Uno.Toolkit.Material/Styles/Controls/NavigationBar.Base.xaml

+1
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,7 @@
350350
Width="Auto" />
351351
</Grid.ColumnDefinitions>
352352
<ContentPresenter x:Name="MainCommandPresenter"
353+
Margin="{TemplateBinding Padding}"
353354
Content="{Binding Path=(utu:CommandBarExtensions.MainCommand), RelativeSource={RelativeSource TemplatedParent}}">
354355
<ContentPresenter.Resources>
355356
<x:Double x:Key="AppBarButtonContentHeight">16</x:Double>

0 commit comments

Comments
 (0)