Merge pull request #1780 from Azaezel/alpha41/uiCleanups
Some checks failed
Linux Build / Ubuntu GCC Latest (push) Has been cancelled
Linux Build / Ubuntu GCC 13 (push) Has been cancelled
MacOSX Build / macOS ARM Clang Ninja (push) Has been cancelled
MacOSX Build / macOS ARM Xcode (push) Has been cancelled
Windows Build / Windows MSVC Ninja (push) Has been cancelled
Windows Build / Windows MSVC Visual Studio 2022 (push) Has been cancelled
Windows Build / Windows MSVC Visual Studio 2026 (push) Has been cancelled

simplify menu navigation button setup
This commit is contained in:
Brian Roberts 2026-06-25 00:30:02 -05:00 committed by GitHub
commit 20bf6b7de9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 13 additions and 12 deletions

View file

@ -82,25 +82,27 @@ $guiContent = new GuiControl(ChooseLevelMenu) {
}; };
new GuiControl(ChooseLevelMenuNavButtonOverlay) { new GuiControl(ChooseLevelMenuNavButtonOverlay) {
position = "0 61"; position = "0 61";
extent = "1281 60"; extent = "1280 60";
horizSizing = "width"; horizSizing = "center";
profile = "GuiNonModalDefaultProfile"; profile = "GuiNonModalDefaultProfile";
tooltipProfile = "GuiToolTipProfile"; tooltipProfile = "GuiToolTipProfile";
isContainer = "1"; isContainer = "1";
new GuiBitmapCtrl(ChooseLevelMenuPrevNavIcon) { new GuiBitmapCtrl(ChooseLevelMenuPrevNavIcon) {
BitmapAsset = "UI:Keyboard_Black_Q_image"; BitmapAsset = "UI:Keyboard_Black_Q_image";
position = "485 24"; position = "188 24";
extent = "40 40"; extent = "40 40";
vertSizing = "top"; vertSizing = "top";
horizSizing = "right";
profile = "GuiNonModalDefaultProfile"; profile = "GuiNonModalDefaultProfile";
tooltipProfile = "GuiToolTipProfile"; tooltipProfile = "GuiToolTipProfile";
}; };
new GuiBitmapCtrl(ChooseLevelMenuNextNavIcon) { new GuiBitmapCtrl(ChooseLevelMenuNextNavIcon) {
BitmapAsset = "UI:Keyboard_Black_E_image"; BitmapAsset = "UI:Keyboard_Black_E_image";
position = "595 24"; position = "1050 24";
extent = "40 40"; extent = "40 40";
vertSizing = "top"; vertSizing = "top";
horizSizing = "left";
profile = "GuiNonModalDefaultProfile"; profile = "GuiNonModalDefaultProfile";
tooltipProfile = "GuiToolTipProfile"; tooltipProfile = "GuiToolTipProfile";
}; };

View file

@ -285,10 +285,7 @@ function ChooseLevelMenu::syncGUI(%this)
%btn.setHighlighted(true); %btn.setHighlighted(true);
%buttonPosX = %btn.position.x + ChooseLevelMenuTabList.position.x; %buttonPosX = %btn.position.x + ChooseLevelMenuTabList.position.x;
ChooseLevelMenuPrevNavIcon.position.x = %buttonPosX;
ChooseLevelMenuNextNavIcon.position.x = %buttonPosX + %btn.extent.x - 40;
ChooseLevelBackBtn.setBitmap(BaseUIActionMap.getCommandButtonBitmap(%device, "BaseUIBackOut")); ChooseLevelBackBtn.setBitmap(BaseUIActionMap.getCommandButtonBitmap(%device, "BaseUIBackOut"));
if(ChooseLevelMenu.currentMenuIdx == 0) if(ChooseLevelMenu.currentMenuIdx == 0)

View file

@ -43,25 +43,27 @@ $guiContent = new GuiControl(GameMenu) {
}; };
new GuiControl(GameMenuNavButtonOverlay) { new GuiControl(GameMenuNavButtonOverlay) {
extent = "1281 60"; extent = "1280 60";
horizSizing = "width"; horizSizing = "center";
vertSizing = "height"; vertSizing = "height";
profile = GuiNonModalDefaultProfile; profile = GuiNonModalDefaultProfile;
new GuiBitmapCtrl(GameMenuPrevNavIcon) { new GuiBitmapCtrl(GameMenuPrevNavIcon) {
BitmapAsset = "UI:Keyboard_Black_Q_image"; BitmapAsset = "UI:Keyboard_Black_Q_image";
position = "0 24"; position = "188 24";
extent = "40 40"; extent = "40 40";
profile = GuiNonModalDefaultProfile; profile = GuiNonModalDefaultProfile;
vertSizing = "top"; vertSizing = "top";
horizSizing = "right";
}; };
new GuiBitmapCtrl(GameMenuNextNavIcon) { new GuiBitmapCtrl(GameMenuNextNavIcon) {
BitmapAsset = "UI:Keyboard_Black_E_image"; BitmapAsset = "UI:Keyboard_Black_E_image";
position = "0 24"; position = "1050 24";
extent = "40 40"; extent = "40 40";
profile = GuiNonModalDefaultProfile; profile = GuiNonModalDefaultProfile;
vertSizing = "top"; vertSizing = "top";
horizSizing = "left";
}; };
}; };
}; };