From 0e9445b79ac04ae8ef2265c434d4fa76ae3dab96 Mon Sep 17 00:00:00 2001 From: F1F7Y <64418963+F1F7Y@users.noreply.github.com> Date: Mon, 28 Feb 2022 21:08:58 +0100 Subject: Add arrow nav to maps menu + fix server browser nav (#248) --- .../mod/resource/ui/menus/panels/map_grid.res | 349 ++++++++++++++++++--- .../resource/ui/menus/panels/map_grid_button.res | 8 - .../mod/resource/ui/menus/server_browser.menu | 1 + 3 files changed, 314 insertions(+), 44 deletions(-) (limited to 'Northstar.Client/mod/resource') diff --git a/Northstar.Client/mod/resource/ui/menus/panels/map_grid.res b/Northstar.Client/mod/resource/ui/menus/panels/map_grid.res index 0c82bcb2..9e3c162a 100644 --- a/Northstar.Client/mod/resource/ui/menus/panels/map_grid.res +++ b/Northstar.Client/mod/resource/ui/menus/panels/map_grid.res @@ -1,201 +1,478 @@ "resource/ui/menus/panels/map_grid.res" { - GridButton0x0 + GridInfo0x0 { ControlName CNestedPanel wide 286 tall 165 - Classname MapGridButtons + Classname MapGridInfo scriptID 0 controlSettingsFile "resource/ui/menus/panels/map_grid_button.res" } - GridButton1x0 + GridInfo1x0 { ControlName CNestedPanel wide 286 tall 165 xpos 2 - Classname MapGridButtons + Classname MapGridInfo scriptID 1 controlSettingsFile "resource/ui/menus/panels/map_grid_button.res" - pin_to_sibling GridButton0x0 + + pin_to_sibling GridInfo0x0 pin_corner_to_sibling TOP_LEFT pin_to_sibling_corner TOP_RIGHT } - GridButton2x0 + GridInfo2x0 { ControlName CNestedPanel wide 286 tall 165 xpos 2 - - Classname MapGridButtons + + Classname MapGridInfo scriptID 2 controlSettingsFile "resource/ui/menus/panels/map_grid_button.res" - pin_to_sibling GridButton1x0 + + pin_to_sibling GridInfo1x0 pin_corner_to_sibling TOP_LEFT pin_to_sibling_corner TOP_RIGHT } - GridButton0x1 + GridInfo0x1 { ControlName CNestedPanel wide 286 tall 165 ypos 2 - Classname MapGridButtons + Classname MapGridInfo scriptID 3 controlSettingsFile "resource/ui/menus/panels/map_grid_button.res" - pin_to_sibling GridButton0x0 + + pin_to_sibling GridInfo0x0 pin_corner_to_sibling TOP_LEFT pin_to_sibling_corner BOTTOM_LEFT } - GridButton1x1 + GridInfo1x1 { ControlName CNestedPanel wide 286 tall 165 xpos 2 - Classname MapGridButtons + Classname MapGridInfo scriptID 4 controlSettingsFile "resource/ui/menus/panels/map_grid_button.res" - pin_to_sibling GridButton0x1 + + pin_to_sibling GridInfo0x1 pin_corner_to_sibling TOP_LEFT pin_to_sibling_corner TOP_RIGHT } - GridButton2x1 + GridInfo2x1 { ControlName CNestedPanel wide 286 tall 165 xpos 2 - Classname MapGridButtons + + Classname MapGridInfo scriptID 5 controlSettingsFile "resource/ui/menus/panels/map_grid_button.res" - pin_to_sibling GridButton1x1 + + pin_to_sibling GridInfo1x1 pin_corner_to_sibling TOP_LEFT pin_to_sibling_corner TOP_RIGHT } - GridButton0x2 + GridInfo0x2 { ControlName CNestedPanel wide 286 tall 165 ypos 2 - Classname MapGridButtons + + Classname MapGridInfo scriptID 6 controlSettingsFile "resource/ui/menus/panels/map_grid_button.res" - pin_to_sibling GridButton0x1 + + pin_to_sibling GridInfo0x1 pin_corner_to_sibling TOP_LEFT pin_to_sibling_corner BOTTOM_LEFT } - GridButton1x2 + GridInfo1x2 { ControlName CNestedPanel wide 286 tall 165 xpos 2 - Classname MapGridButtons + + Classname MapGridInfo scriptID 7 controlSettingsFile "resource/ui/menus/panels/map_grid_button.res" - pin_to_sibling GridButton0x2 + + pin_to_sibling GridInfo0x2 pin_corner_to_sibling TOP_LEFT pin_to_sibling_corner TOP_RIGHT } - GridButton2x2 + GridInfo2x2 { ControlName CNestedPanel wide 286 tall 165 xpos 2 - Classname MapGridButtons + + Classname MapGridInfo scriptID 8 controlSettingsFile "resource/ui/menus/panels/map_grid_button.res" - pin_to_sibling GridButton1x2 + + pin_to_sibling GridInfo1x2 pin_corner_to_sibling TOP_LEFT pin_to_sibling_corner TOP_RIGHT } - GridButton0x3 + GridInfo0x3 { ControlName CNestedPanel wide 286 tall 165 ypos 2 - Classname MapGridButtons + + Classname MapGridInfo scriptID 9 controlSettingsFile "resource/ui/menus/panels/map_grid_button.res" - pin_to_sibling GridButton0x2 + + pin_to_sibling GridInfo0x2 pin_corner_to_sibling TOP_LEFT pin_to_sibling_corner BOTTOM_LEFT } - GridButton1x3 + GridInfo1x3 { ControlName CNestedPanel wide 286 tall 165 xpos 2 - Classname MapGridButtons + + Classname MapGridInfo scriptID 10 controlSettingsFile "resource/ui/menus/panels/map_grid_button.res" - pin_to_sibling GridButton0x3 + + pin_to_sibling GridInfo0x3 pin_corner_to_sibling TOP_LEFT pin_to_sibling_corner TOP_RIGHT } - GridButton2x3 + GridInfo2x3 { ControlName CNestedPanel wide 286 tall 165 xpos 2 - Classname MapGridButtons + + Classname MapGridInfo scriptID 11 controlSettingsFile "resource/ui/menus/panels/map_grid_button.res" + + pin_to_sibling GridInfo1x3 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner TOP_RIGHT + } + +//-------------------------------------------------------------------- + + GridButton0x0 + { + ControlName RuiButton + InheritProperties RuiSmallButton + wide 286 + tall 165 + + Classname MapGridButtons + scriptID 0 + + navDown GridButton0x1 + navRight GridButton1x0 + navUp DummyTop + } + + GridButton1x0 + { + ControlName RuiButton + InheritProperties RuiSmallButton + wide 286 + tall 165 + xpos 2 + + Classname MapGridButtons + scriptID 1 + + pin_to_sibling GridButton0x0 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner TOP_RIGHT + + navDown GridButton1x1 + navRight GridButton2x0 + navLeft GridButton0x0 + navUp DummyTop + } + + GridButton2x0 + { + ControlName RuiButton + InheritProperties RuiSmallButton + wide 286 + tall 165 + xpos 2 + + Classname MapGridButtons + scriptID 2 + + pin_to_sibling GridButton1x0 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner TOP_RIGHT + + navDown GridButton2x1 + navLeft GridButton1x0 + navUp DummyTop + } + + GridButton0x1 + { + ControlName RuiButton + InheritProperties RuiSmallButton + wide 286 + tall 165 + ypos 2 + + Classname MapGridButtons + scriptID 3 + + pin_to_sibling GridInfo0x0 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner BOTTOM_LEFT + + navUp GridButton0x0 + navRight GridButton1x1 + navDown GridButton0x2 + } + + GridButton1x1 + { + ControlName RuiButton + InheritProperties RuiSmallButton + wide 286 + tall 165 + xpos 2 + + Classname MapGridButtons + scriptID 4 + + pin_to_sibling GridButton0x1 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner TOP_RIGHT + + navUp GridButton1x0 + navDown GridButton1x2 + navRight GridButton2x1 + navLeft GridButton0x1 + } + + GridButton2x1 + { + ControlName RuiButton + InheritProperties RuiSmallButton + wide 286 + tall 165 + xpos 2 + + Classname MapGridButtons + scriptID 5 + + pin_to_sibling GridButton1x1 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner TOP_RIGHT + + navUp GridButton2x0 + navDown GridButton2x2 + navLeft GridButton1x1 + } + + GridButton0x2 + { + ControlName RuiButton + InheritProperties RuiSmallButton + wide 286 + tall 165 + ypos 2 + + Classname MapGridButtons + scriptID 6 + + pin_to_sibling GridInfo0x1 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner BOTTOM_LEFT + + navUp GridButton0x1 + navDown GridButton0x3 + navRight GridButton1x2 + } + + GridButton1x2 + { + ControlName RuiButton + InheritProperties RuiSmallButton + wide 286 + tall 165 + xpos 2 + + Classname MapGridButtons + scriptID 7 + + pin_to_sibling GridButton0x2 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner TOP_RIGHT + + navUp GridButton1x1 + navDown GridButton1x3 + navRight GridButton2x2 + navLeft GridButton0x2 + } + + GridButton2x2 + { + ControlName RuiButton + InheritProperties RuiSmallButton + wide 286 + tall 165 + xpos 2 + + Classname MapGridButtons + scriptID 8 + + pin_to_sibling GridButton1x2 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner TOP_RIGHT + + navUp GridButton2x1 + navDown GridButton2x3 + navLeft GridButton1x2 + } + + GridButton0x3 + { + ControlName RuiButton + InheritProperties RuiSmallButton + wide 286 + tall 165 + ypos 2 + + Classname MapGridButtons + scriptID 9 + + pin_to_sibling GridInfo0x2 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner BOTTOM_LEFT + + navUp GridButton0x2 + navRight GridButton1x3 + navDown DummyBottom + } + + GridButton1x3 + { + ControlName RuiButton + InheritProperties RuiSmallButton + wide 286 + tall 165 + xpos 2 + + Classname MapGridButtons + scriptID 10 + + pin_to_sibling GridButton0x3 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner TOP_RIGHT + + navUp GridButton1x2 + navRight GridButton2x3 + navLeft GridButton0x3 + navDown DummyBottom + } + + GridButton2x3 + { + ControlName RuiButton + InheritProperties RuiSmallButton + wide 286 + tall 165 + xpos 2 + + Classname MapGridButtons + scriptID 11 + pin_to_sibling GridButton1x3 pin_corner_to_sibling TOP_LEFT pin_to_sibling_corner TOP_RIGHT + + navUp GridButton2x2 + navLeft GridButton1x3 + navDown DummyBottom + } + +//-------------------------------------------------------------------- + + DummyTop + { + ControlName RuiButton + InheritProperties RuiSmallButton + wide 0 + tall 0 + } + + DummyBottom + { + ControlName RuiButton + InheritProperties RuiSmallButton + wide 0 + tall 0 } -} \ No newline at end of file +} diff --git a/Northstar.Client/mod/resource/ui/menus/panels/map_grid_button.res b/Northstar.Client/mod/resource/ui/menus/panels/map_grid_button.res index 23c040db..3e1ffe0c 100644 --- a/Northstar.Client/mod/resource/ui/menus/panels/map_grid_button.res +++ b/Northstar.Client/mod/resource/ui/menus/panels/map_grid_button.res @@ -49,14 +49,6 @@ pin_to_sibling_corner BOTTOM_RIGHT } - MapButton - { - ControlName RuiButton - InheritProperties RuiSmallButton - wide 286 - tall 165 - } - MapNameLockedForeground { ControlName RuiPanel diff --git a/Northstar.Client/mod/resource/ui/menus/server_browser.menu b/Northstar.Client/mod/resource/ui/menus/server_browser.menu index b03e0da8..89fb951d 100644 --- a/Northstar.Client/mod/resource/ui/menus/server_browser.menu +++ b/Northstar.Client/mod/resource/ui/menus/server_browser.menu @@ -2583,6 +2583,7 @@ resource/ui/menus/mods_browse.menu fgcolor_override "255 255 255 175" visible 1 + pin_to_sibling FilterPanel pin_corner_to_sibling TOP_LEFT pin_to_sibling_corner BOTTOM_LEFT -- cgit v1.2.3