Resolve merge conflict and set fixed width for Settings menu item

This commit is contained in:
Reza Bakhshi Laktasaraei 2025-04-14 01:57:36 +03:30
parent 5c310dfe94
commit d6bd69d631

View file

@ -147,8 +147,7 @@
</Menu> </Menu>
<Separator /> <Separator />
<Menu Margin="0,1" Style="{StaticResource ToolbarMenu}"> <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
<MenuItem Padding="8,0" <MenuItem Padding="8,0" Width="86"
>>>>>>> ce6572af3da479b546bc9ea764a4462050ea0ba5
AutomationProperties.Name="{x:Static resx:ResUI.menuSetting}"> AutomationProperties.Name="{x:Static resx:ResUI.menuSetting}">
<MenuItem.Header> <MenuItem.Header>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">