From d2c08c72bdfcbe2c368763d249d969f942559728 Mon Sep 17 00:00:00 2001 From: Ivaylo Draganov Date: Fri, 24 Sep 2021 17:16:31 +0300 Subject: [PATCH] Adjust size, position and white-space of several panels --- mods/cnc/chrome/editor.yaml | 16 ++++++++-------- mods/cnc/chrome/lobby.yaml | 10 +++++----- mods/cnc/chrome/mapchooser.yaml | 4 ++-- mods/cnc/chrome/multiplayer-browser.yaml | 8 ++++---- mods/cnc/chrome/multiplayer-createserver.yaml | 8 ++++---- mods/common/chrome/multiplayer-browser.yaml | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/mods/cnc/chrome/editor.yaml b/mods/cnc/chrome/editor.yaml index b12fb30134..38db0c2655 100644 --- a/mods/cnc/chrome/editor.yaml +++ b/mods/cnc/chrome/editor.yaml @@ -3,7 +3,7 @@ Container@NEW_MAP_BG: X: (WINDOW_RIGHT - WIDTH) / 2 Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 300 - Height: 125 + Height: 95 Children: Label@TITLE: Text: New Map @@ -14,7 +14,7 @@ Container@NEW_MAP_BG: Align: Center Background@bg: Width: PARENT_RIGHT - Height: 90 + Height: PARENT_BOTTOM Background: panel-black Children: Label@TILESET_LABEL: @@ -60,7 +60,7 @@ Container@NEW_MAP_BG: Text: 128 Type: Integer Button@CANCEL_BUTTON: - Y: 89 + Y: PARENT_BOTTOM - 1 Width: 140 Height: 35 Text: Cancel @@ -68,7 +68,7 @@ Container@NEW_MAP_BG: Key: escape Button@CREATE_BUTTON: X: PARENT_RIGHT - WIDTH - Y: 89 + Y: PARENT_BOTTOM - 1 Width: 140 Height: 35 Text: Create @@ -80,7 +80,7 @@ Container@SAVE_MAP_PANEL: X: (WINDOW_RIGHT - WIDTH) / 2 Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 345 - Height: 229 + Height: 195 Children: Label@LABEL_TITLE: Text: Save Map @@ -91,7 +91,7 @@ Container@SAVE_MAP_PANEL: Align: Center Background@SAVE_MAP_BACKGROUND: Width: PARENT_RIGHT - Height: 195 + Height: PARENT_BOTTOM Background: panel-black Children: Label@TITLE_LABEL: @@ -167,7 +167,7 @@ Container@SAVE_MAP_PANEL: Height: 25 Font: Regular Button@BACK_BUTTON: - Y: PARENT_BOTTOM - 35 + Y: PARENT_BOTTOM - 1 Width: 140 Height: 35 Text: Cancel @@ -175,7 +175,7 @@ Container@SAVE_MAP_PANEL: Key: escape Button@SAVE_BUTTON: X: PARENT_RIGHT - 140 - Y: PARENT_BOTTOM - 35 + Y: PARENT_BOTTOM - 1 Width: 140 Height: 35 Text: Save diff --git a/mods/cnc/chrome/lobby.yaml b/mods/cnc/chrome/lobby.yaml index f1e5353af4..573a13e66d 100644 --- a/mods/cnc/chrome/lobby.yaml +++ b/mods/cnc/chrome/lobby.yaml @@ -6,9 +6,9 @@ Container@SERVER_LOBBY: Mission: CHAT_LINE_TEMPLATE Feedback: TRANSIENT_LINE_TEMPLATE X: (WINDOW_RIGHT - WIDTH) / 2 - Y: (WINDOW_BOTTOM - 560) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 900 - Height: 575 + Height: 540 Children: Label@SERVER_NAME: Width: PARENT_RIGHT @@ -18,7 +18,7 @@ Container@SERVER_LOBBY: Align: Center Background@bg: Width: PARENT_RIGHT - Height: PARENT_BOTTOM - 35 + Height: PARENT_BOTTOM Background: panel-black Children: Container@MAP_PREVIEW_ROOT: @@ -119,13 +119,13 @@ Container@SERVER_LOBBY: Width: PARENT_RIGHT - 55 Height: 25 Button@DISCONNECT_BUTTON: - Y: PARENT_BOTTOM - 36 + Y: PARENT_BOTTOM - 1 Width: 140 Height: 35 Text: Leave Game Button@START_GAME_BUTTON: X: PARENT_RIGHT - WIDTH - Y: PARENT_BOTTOM - 36 + Y: PARENT_BOTTOM - 1 Width: 140 Height: 35 Text: Start Game diff --git a/mods/cnc/chrome/mapchooser.yaml b/mods/cnc/chrome/mapchooser.yaml index e0446c102d..1e5a59367d 100644 --- a/mods/cnc/chrome/mapchooser.yaml +++ b/mods/cnc/chrome/mapchooser.yaml @@ -1,9 +1,9 @@ Container@MAPCHOOSER_PANEL: Logic: MapChooserLogic X: (WINDOW_RIGHT - WIDTH) / 2 - Y: (WINDOW_BOTTOM - 560) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 900 - Height: 575 + Height: 540 Children: Label@TITLE: Width: PARENT_RIGHT diff --git a/mods/cnc/chrome/multiplayer-browser.yaml b/mods/cnc/chrome/multiplayer-browser.yaml index d912bfcc60..d5a8ae6695 100644 --- a/mods/cnc/chrome/multiplayer-browser.yaml +++ b/mods/cnc/chrome/multiplayer-browser.yaml @@ -1,9 +1,9 @@ Container@MULTIPLAYER_PANEL: Logic: MultiplayerLogic X: (WINDOW_RIGHT - WIDTH) / 2 - Y: (WINDOW_BOTTOM - 560) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 900 - Height: 575 + Height: 540 Children: Label@TITLE: Text: Multiplayer @@ -14,7 +14,7 @@ Container@MULTIPLAYER_PANEL: Align: Center Background@bg: Width: PARENT_RIGHT - Height: PARENT_BOTTOM - 35 + Height: PARENT_BOTTOM Background: panel-black Children: Container@LABEL_CONTAINER: @@ -254,7 +254,7 @@ Container@MULTIPLAYER_PANEL: Button@BACK_BUTTON: Key: escape X: 0 - Y: PARENT_BOTTOM - 36 + Y: PARENT_BOTTOM - 1 Width: 140 Height: 35 Text: Back diff --git a/mods/cnc/chrome/multiplayer-createserver.yaml b/mods/cnc/chrome/multiplayer-createserver.yaml index ef386ef249..ccfb9f24ac 100644 --- a/mods/cnc/chrome/multiplayer-createserver.yaml +++ b/mods/cnc/chrome/multiplayer-createserver.yaml @@ -14,7 +14,7 @@ Container@MULTIPLAYER_CREATESERVER_PANEL: Text: Create Server Background@bg: Width: PARENT_RIGHT - Height: PARENT_BOTTOM - 35 + Height: PARENT_BOTTOM Background: panel-black Children: Label@SERVER_NAME_LABEL: @@ -242,20 +242,20 @@ Container@MULTIPLAYER_CREATESERVER_PANEL: Align: Center Button@BACK_BUTTON: Key: return - Y: PARENT_BOTTOM - 36 + Y: PARENT_BOTTOM - 1 Width: 140 Height: 35 Text: Back Button@MAP_BUTTON: X: PARENT_RIGHT - WIDTH - 150 - Y: PARENT_BOTTOM - 36 + Y: PARENT_BOTTOM - 1 Width: 140 Height: 35 Text: Change Map Button@CREATE_BUTTON: Key: return X: PARENT_RIGHT - WIDTH - Y: PARENT_BOTTOM - 36 + Y: PARENT_BOTTOM - 1 Width: 140 Height: 35 Text: Create diff --git a/mods/common/chrome/multiplayer-browser.yaml b/mods/common/chrome/multiplayer-browser.yaml index 54466e64c6..f1dd5b4f37 100644 --- a/mods/common/chrome/multiplayer-browser.yaml +++ b/mods/common/chrome/multiplayer-browser.yaml @@ -76,7 +76,7 @@ Background@MULTIPLAYER_PANEL: X: 20 Y: 67 Width: 675 - Height: PARENT_BOTTOM - 119 + Height: PARENT_BOTTOM - 122 TopBottomSpacing: 2 Children: ScrollItem@HEADER_TEMPLATE: