tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify separated screen top menu (#33047)

Browse Source
This commit is contained in:
metalgearsloth
2024-11-26 11:59:34 +11:00
committed by GitHub
parent e9eca826d8
commit f27fa1ed30
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
View File

@@ -11,17 +11,21 @@
Orientation="Horizontal" Orientation="Horizontal"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Top" VerticalAlignment="Top"
SeparationOverride="5"
> >
<GridContainer
Rows="2"
HSeparationOverride="5"
VSeparationOverride="5"
HorizontalExpand="True">
<ui:MenuButton <ui:MenuButton
Name="EscapeButton" Name="EscapeButton"
Access="Internal" Access="Internal"
Icon="{xe:Tex '/Textures/Interface/hamburger.svg.192dpi.png'}" Icon="{xe:Tex '/Textures/Interface/hamburger.svg.192dpi.png'}"
BoundKey = "{x:Static ic:EngineKeyFunctions.EscapeMenu}" BoundKey = "{x:Static ic:EngineKeyFunctions.EscapeMenu}"
ToolTip="{Loc 'game-hud-open-escape-menu-button-tooltip'}" ToolTip="{Loc 'game-hud-open-escape-menu-button-tooltip'}"
MinSize="70 64" MinSize="48 64"
HorizontalExpand="True" HorizontalExpand="True"
AppendStyleClass="{x:Static style:StyleBase.ButtonOpenRight}" AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
/> />
<ui:MenuButton <ui:MenuButton
Name="GuidebookButton" Name="GuidebookButton"
@@ -29,7 +33,7 @@
Icon="{xe:Tex '/Textures/Interface/VerbIcons/information.svg.192dpi.png'}" Icon="{xe:Tex '/Textures/Interface/VerbIcons/information.svg.192dpi.png'}"
ToolTip="{Loc 'game-hud-open-guide-menu-button-tooltip'}" ToolTip="{Loc 'game-hud-open-guide-menu-button-tooltip'}"
BoundKey = "{x:Static is:ContentKeyFunctions.OpenGuidebook}" BoundKey = "{x:Static is:ContentKeyFunctions.OpenGuidebook}"
MinSize="42 64" MinSize="48 64"
HorizontalExpand="True" HorizontalExpand="True"
AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}" AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
/> />
@@ -39,7 +43,7 @@
Icon="{xe:Tex '/Textures/Interface/character.svg.192dpi.png'}" Icon="{xe:Tex '/Textures/Interface/character.svg.192dpi.png'}"
ToolTip="{Loc 'game-hud-open-character-menu-button-tooltip'}" ToolTip="{Loc 'game-hud-open-character-menu-button-tooltip'}"
BoundKey = "{x:Static is:ContentKeyFunctions.OpenCharacterMenu}" BoundKey = "{x:Static is:ContentKeyFunctions.OpenCharacterMenu}"
MinSize="42 64" MinSize="48 64"
HorizontalExpand="True" HorizontalExpand="True"
AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}" AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
/> />
@@ -49,7 +53,7 @@
Icon="{xe:Tex '/Textures/Interface/emotes.svg.192dpi.png'}" Icon="{xe:Tex '/Textures/Interface/emotes.svg.192dpi.png'}"
ToolTip="{Loc 'game-hud-open-emotes-menu-button-tooltip'}" ToolTip="{Loc 'game-hud-open-emotes-menu-button-tooltip'}"
BoundKey = "{x:Static is:ContentKeyFunctions.OpenEmotesMenu}" BoundKey = "{x:Static is:ContentKeyFunctions.OpenEmotesMenu}"
MinSize="42 64" MinSize="48 64"
HorizontalExpand="True" HorizontalExpand="True"
AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}" AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
/> />
@@ -59,7 +63,7 @@
Icon="{xe:Tex '/Textures/Interface/hammer.svg.192dpi.png'}" Icon="{xe:Tex '/Textures/Interface/hammer.svg.192dpi.png'}"
BoundKey = "{x:Static is:ContentKeyFunctions.OpenCraftingMenu}" BoundKey = "{x:Static is:ContentKeyFunctions.OpenCraftingMenu}"
ToolTip="{Loc 'game-hud-open-crafting-menu-button-tooltip'}" ToolTip="{Loc 'game-hud-open-crafting-menu-button-tooltip'}"
MinSize="42 64" MinSize="48 64"
HorizontalExpand="True" HorizontalExpand="True"
AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}" AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
/> />
@@ -69,7 +73,7 @@
Icon="{xe:Tex '/Textures/Interface/fist.svg.192dpi.png'}" Icon="{xe:Tex '/Textures/Interface/fist.svg.192dpi.png'}"
BoundKey = "{x:Static is:ContentKeyFunctions.OpenActionsMenu}" BoundKey = "{x:Static is:ContentKeyFunctions.OpenActionsMenu}"
ToolTip="{Loc 'game-hud-open-actions-menu-button-tooltip'}" ToolTip="{Loc 'game-hud-open-actions-menu-button-tooltip'}"
MinSize="42 64" MinSize="48 64"
HorizontalExpand="True" HorizontalExpand="True"
AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}" AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
/> />
@@ -79,7 +83,7 @@
Icon="{xe:Tex '/Textures/Interface/gavel.svg.192dpi.png'}" Icon="{xe:Tex '/Textures/Interface/gavel.svg.192dpi.png'}"
BoundKey = "{x:Static is:ContentKeyFunctions.OpenAdminMenu}" BoundKey = "{x:Static is:ContentKeyFunctions.OpenAdminMenu}"
ToolTip="{Loc 'game-hud-open-admin-menu-button-tooltip'}" ToolTip="{Loc 'game-hud-open-admin-menu-button-tooltip'}"
MinSize="42 64" MinSize="48 64"
HorizontalExpand="True" HorizontalExpand="True"
AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}" AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
/> />
@@ -89,7 +93,7 @@
Icon="{xe:Tex '/Textures/Interface/sandbox.svg.192dpi.png'}" Icon="{xe:Tex '/Textures/Interface/sandbox.svg.192dpi.png'}"
BoundKey = "{x:Static is:ContentKeyFunctions.OpenSandboxWindow}" BoundKey = "{x:Static is:ContentKeyFunctions.OpenSandboxWindow}"
ToolTip="{Loc 'game-hud-open-sandbox-menu-button-tooltip'}" ToolTip="{Loc 'game-hud-open-sandbox-menu-button-tooltip'}"
MinSize="42 64" MinSize="48 64"
HorizontalExpand="True" HorizontalExpand="True"
AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}" AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
/> />
@@ -99,8 +103,9 @@
Icon="{xe:Tex '/Textures/Interface/info.svg.192dpi.png'}" Icon="{xe:Tex '/Textures/Interface/info.svg.192dpi.png'}"
BoundKey = "{x:Static is:ContentKeyFunctions.OpenAHelp}" BoundKey = "{x:Static is:ContentKeyFunctions.OpenAHelp}"
ToolTip="{Loc 'ui-options-function-open-a-help'}" ToolTip="{Loc 'ui-options-function-open-a-help'}"
MinSize="42 64" MinSize="48 64"
HorizontalExpand="True" HorizontalExpand="True"
AppendStyleClass="{x:Static style:StyleBase.ButtonOpenLeft}" AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
/> />
</GridContainer>
</widgets:GameTopMenuBar> </widgets:GameTopMenuBar>