Skip to content

Commit 7ba7e58

Browse files
committed
style: keep the launcher's title bar consistent across platforms
1 parent 56f5f3b commit 7ba7e58

File tree

1 file changed

+3
-19
lines changed

1 file changed

+3
-19
lines changed

src/SourceGit/Views/Launcher.axaml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,11 @@
4848
<v:CaptionButtonsMacOS VerticalAlignment="Bottom"/>
4949
</Border>
5050

51-
<!-- Menu (Windows) -->
52-
<Button Grid.Column="0"
51+
<!-- Menu -->
52+
<Button Grid.Column="{OnPlatform 0, macOS=2}"
5353
Classes="icon_button"
5454
Margin="4,0,2,3"
55-
VerticalAlignment="Bottom"
56-
IsVisible="{OnPlatform True, macOS=False}">
55+
VerticalAlignment="Bottom">
5756
<Button.Flyout>
5857
<MenuFlyout Placement="BottomEdgeAlignedLeft" VerticalOffset="-8">
5958
<MenuItem Header="{DynamicResource Text.Preference}" Click="OpenPreference">
@@ -225,21 +224,6 @@
225224
</Button>
226225
</Grid>
227226

228-
<!-- Extra Buttons (macOS) -->
229-
<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="32,0,8,0" Height="30" VerticalAlignment="Bottom" IsVisible="{OnPlatform False, macOS=True}">
230-
<Button Classes="icon_button" Width="32" Height="28" Click="OpenPreference" ToolTip.Tip="{DynamicResource Text.Preference}">
231-
<Path Width="16" Height="16" Data="{StaticResource Icons.Settings2}"/>
232-
</Button>
233-
234-
<Button Classes="icon_button" Width="32" Height="28" Click="OpenHotkeys" ToolTip.Tip="{DynamicResource Text.Hotkeys}">
235-
<Path Width="16" Height="16" Data="{StaticResource Icons.Hotkeys}"/>
236-
</Button>
237-
238-
<Button Classes="icon_button" Width="32" Height="28" Click="OpenAboutDialog" ToolTip.Tip="{DynamicResource Text.About}">
239-
<Path Width="16" Height="16" Data="{StaticResource Icons.Info}"/>
240-
</Button>
241-
</StackPanel>
242-
243227
<!-- Caption Buttons (Windows/Linux)-->
244228
<Border Grid.Column="2" Margin="32,0,0,0" IsVisible="{OnPlatform True, macOS=False}">
245229
<v:CaptionButtons Height="30" VerticalAlignment="Top"/>

0 commit comments

Comments
 (0)