Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust widget sizes to ensure they accommodate the English translation text #21309

Merged
merged 1 commit into from
Jan 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions mods/cnc/chrome/assetbrowser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ Container@ASSETBROWSER_PANEL:
LogicTicker@ANIMATION_TICKER:
Label@ASSETBROWSER_TITLE:
Width: PARENT_RIGHT
Y: 0 - 22
Height: 25
Y: 0 - 34
Font: BigBold
Contrast: true
Align: Center
Expand Down Expand Up @@ -77,7 +78,7 @@ Container@ASSETBROWSER_PANEL:
Label@SPRITE_SCALE:
X: PARENT_RIGHT - WIDTH - 440
Y: 31
Width: 40
Width: 50
Height: 25
Font: Bold
Align: Left
Expand Down
9 changes: 6 additions & 3 deletions mods/cnc/chrome/connection.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ Container@CONNECTING_PANEL:
Children:
Label@CONNECTING_TITLE:
Width: PARENT_RIGHT
Y: 0 - 22
Height: 25
Y: 0 - 34
Font: BigBold
Contrast: true
Align: Center
Expand Down Expand Up @@ -41,7 +42,8 @@ Container@CONNECTIONFAILED_PANEL:
LogicTicker@CONNECTION_FAILED_TICKER:
Label@TITLE:
Width: PARENT_RIGHT
Y: 0 - 22
Height: 25
Y: 0 - 34
Font: BigBold
Contrast: true
Align: Center
Expand Down Expand Up @@ -106,7 +108,8 @@ Container@CONNECTION_SWITCHMOD_PANEL:
Children:
Label@TITLE:
Width: PARENT_RIGHT
Y: 0 - 22
Height: 25
Y: 0 - 34
Font: BigBold
Contrast: true
Align: Center
Expand Down
3 changes: 2 additions & 1 deletion mods/cnc/chrome/credits.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ Container@CREDITS_PANEL:
Children:
Label@CREDITS_TITLE:
Width: PARENT_RIGHT
Y: 0 - 22
Height: 25
Y: 0 - 34
Font: BigBold
Contrast: true
Align: Center
Expand Down
9 changes: 6 additions & 3 deletions mods/cnc/chrome/dialogs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@ Background@THREEBUTTON_PROMPT:
Children:
Label@PROMPT_TITLE:
Width: PARENT_RIGHT
Y: 0 - 22
Height: 25
Y: 0 - 34
Font: BigBold
Contrast: true
Align: Center
Expand Down Expand Up @@ -205,7 +206,8 @@ Background@TWOBUTTON_PROMPT:
Children:
Label@PROMPT_TITLE:
Width: PARENT_RIGHT
Y: 0 - 22
Height: 25
Y: 0 - 34
Font: BigBold
Contrast: true
Align: Center
Expand Down Expand Up @@ -239,7 +241,8 @@ Container@TEXT_INPUT_PROMPT:
Children:
Label@PROMPT_TITLE:
Width: PARENT_RIGHT
Y: 0 - 22
Height: 25
Y: 0 - 34
Font: BigBold
Contrast: true
Align: Center
Expand Down
6 changes: 4 additions & 2 deletions mods/cnc/chrome/editor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ Container@NEW_MAP_BG:
Label@TITLE:
Text: label-new-map-bg-title
Width: PARENT_RIGHT
Y: 0 - 22
Height: 25
Y: 0 - 34
Font: BigBold
Contrast: true
Align: Center
Expand Down Expand Up @@ -85,7 +86,8 @@ Container@SAVE_MAP_PANEL:
Label@LABEL_TITLE:
Text: label-save-map-panel-title
Width: PARENT_RIGHT
Y: 0 - 22
Height: 25
Y: 0 - 34
Font: BigBold
Contrast: true
Align: Center
Expand Down
6 changes: 4 additions & 2 deletions mods/cnc/chrome/gamesave-browser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,17 @@ Container@GAMESAVE_BROWSER_PANEL:
Children:
Label@LOAD_TITLE:
Width: PARENT_RIGHT
Y: 0 - 22
Height: 25
Y: 0 - 34
Font: BigBold
Contrast: true
Align: Center
Text: label-gamesave-browser-panel-load-title
Visible: False
Label@SAVE_TITLE:
Width: PARENT_RIGHT
Y: 0 - 22
Height: 25
Y: 0 - 34
Font: BigBold
Contrast: true
Align: Center
Expand Down
6 changes: 4 additions & 2 deletions mods/cnc/chrome/ingame-debug.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ Container@DEBUG_PANEL:
Height: PARENT_BOTTOM
Children:
Label@TITLE:
Y: 26
Y: 16
Font: Bold
Text: label-debug-panel-title
Align: Center
Width: PARENT_RIGHT
Height: 20
Checkbox@INSTANT_BUILD:
X: 45
Y: 45
Expand Down Expand Up @@ -76,11 +77,12 @@ Container@DEBUG_PANEL:
Height: 35
Text: button-debug-panel-reset-exploration
Label@VISUALIZATIONS_TITLE:
Y: 256
Y: 246
Font: Bold
Text: label-debug-panel-visualizations-title
Align: Center
Width: PARENT_RIGHT
Height: 20
Checkbox@SHOW_UNIT_PATHS:
X: 45
Y: 275
Expand Down
3 changes: 2 additions & 1 deletion mods/cnc/chrome/ingame-info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ Container@GAME_INFO_PANEL:
Children:
Label@TITLE:
Width: PARENT_RIGHT
Y: 0 - 22
Height: 25
Y: 0 - 34
Text: label-game-info-panel-title
Align: Center
Font: BigBold
Expand Down
2 changes: 1 addition & 1 deletion mods/cnc/chrome/ingame-infostats.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Container@SKIRMISH_STATS:
Font: Bold
Label@ACTIONS:
X: 457
Width: 20
Width: 80
Height: 25
Text: label-stats-actions
Font: Bold
Expand Down
8 changes: 5 additions & 3 deletions mods/cnc/chrome/ingame.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ Container@OBSERVER_WIDGETS:
Container@ECONOMY_STATS_HEADERS:
X: 0
Y: 0
Width: 730
Width: 735
Height: PARENT_BOTTOM
Children:
ColorBlock@HEADER_COLOR:
Expand Down Expand Up @@ -490,7 +490,7 @@ Container@OBSERVER_WIDGETS:
Shadow: True
Label@DERRICKS_HEADER:
X: 650
Width: 75
Width: 80
Height: PARENT_BOTTOM
Font: Bold
Text: label-economy-stats-derricks-header
Expand Down Expand Up @@ -563,7 +563,7 @@ Container@OBSERVER_WIDGETS:
Label@SUPPORT_POWERS_HEADER:
X: 160
Y: 0
Width: 100
Width: 200
Height: PARENT_BOTTOM
Font: Bold
Text: label-support-powers-header
Expand Down Expand Up @@ -1211,6 +1211,7 @@ Container@PLAYER_WIDGETS:
ClickThrough: false
Background: panel-black
SupportPowers@SUPPORT_PALETTE:
IconSize: 64, 48
X: 1
Y: 1
TooltipContainer: TOOLTIP_CONTAINER
Expand Down Expand Up @@ -1863,6 +1864,7 @@ Container@PLAYER_WIDGETS:
Height: 50
Background: panel-black
ProductionPalette@PRODUCTION_PALETTE:
IconSize: 64, 48
X: WINDOW_RIGHT - 5 - 17 - 194
Y: 320
Width: 192
Expand Down
4 changes: 2 additions & 2 deletions mods/cnc/chrome/lobby-players.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Container@LOBBY_PLAYER_BIN:
Font: Bold
Label@LABEL_LOBBY_STATUS:
X: 627
Width: 20
Width: 20 + 24
Height: 25
Text: label-container-lobby-status
Align: Left
Expand Down Expand Up @@ -257,7 +257,7 @@ Container@LOBBY_PLAYER_BIN:
Text: label-faction-factionname
Label@TEAM:
X: 435
Width: 25
Width: 44
Height: 25
Align: Center
DropDownButton@TEAM_DROPDOWN:
Expand Down
3 changes: 2 additions & 1 deletion mods/cnc/chrome/lobby.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ Container@SERVER_LOBBY:
Children:
Label@SERVER_NAME:
Width: PARENT_RIGHT
Y: 0 - 22
Height: 25
Y: 0 - 34
Font: BigBold
Contrast: true
Align: Center
Expand Down
24 changes: 22 additions & 2 deletions mods/cnc/chrome/mainmenu-prompts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ Container@MAINMENU_INTRODUCTION_PROMPT:
Children:
Label@PROMPT_TITLE:
Width: PARENT_RIGHT
Y: 0 - 25
Height: 25
Y: 0 - 37
Font: BigBold
Contrast: true
Align: Center
Expand Down Expand Up @@ -129,47 +130,56 @@ Container@MAINMENU_INTRODUCTION_PROMPT:
Width: PARENT_RIGHT / 2 - 20
Children:
LabelWithHighlight@DESC_SELECTION:
Width: PARENT_RIGHT
Height: 16
Font: Small
Text: label-mouse-control-desc-classic-selection
LabelWithHighlight@DESC_COMMANDS:
Y: 17
Width: PARENT_RIGHT
Height: 16
Font: Small
Text: label-mouse-control-desc-classic-commands
LabelWithHighlight@DESC_BUILDIGS:
Y: 34
Width: PARENT_RIGHT
Height: 16
Font: Small
Text: label-mouse-control-desc-classic-buildigs
LabelWithHighlight@DESC_SUPPORT:
Y: 51
Width: PARENT_RIGHT
Height: 16
Font: Small
Text: label-mouse-control-desc-classic-support
LabelWithHighlight@DESC_ZOOM:
Y: 68
Width: PARENT_RIGHT
Height: 16
Font: Small
Text: label-mouse-control-desc-classic-zoom
LabelWithHighlight@DESC_ZOOM_MODIFIER:
Y: 68
Width: PARENT_RIGHT
Height: 16
Font: Small
Text: label-mouse-control-desc-classic-zoom-modifier
LabelWithHighlight@DESC_SCROLL_RIGHT:
Y: 85
Width: PARENT_RIGHT
Height: 16
Font: Small
Text: label-mouse-control-desc-classic-scroll-right
LabelWithHighlight@DESC_SCROLL_MIDDLE:
Y: 85
Width: PARENT_RIGHT
Height: 16
Font: Small
Text: label-mouse-control-desc-classic-scroll-middle
Label@DESC_EDGESCROLL:
X: 9
Y: 102
Width: PARENT_RIGHT
Height: 16
Font: Small
Text: label-mouse-control-desc-classic-edgescroll
Expand All @@ -178,47 +188,56 @@ Container@MAINMENU_INTRODUCTION_PROMPT:
Width: PARENT_RIGHT / 2 - 20
Children:
LabelWithHighlight@DESC_SELECTION:
Width: PARENT_RIGHT
Height: 16
Font: Small
Text: label-mouse-control-desc-modern-selection
LabelWithHighlight@DESC_COMMANDS:
Y: 17
Width: PARENT_RIGHT
Height: 16
Font: Small
Text: label-mouse-control-desc-modern-commands
LabelWithHighlight@DESC_BUILDIGS:
Y: 34
Width: PARENT_RIGHT
Height: 16
Font: Small
Text: label-mouse-control-desc-modern-buildigs
LabelWithHighlight@DESC_SUPPORT:
Y: 51
Width: PARENT_RIGHT
Height: 16
Font: Small
Text: label-mouse-control-desc-modern-support
LabelWithHighlight@DESC_ZOOM:
Y: 68
Width: PARENT_RIGHT
Height: 16
Font: Small
Text: label-mouse-control-desc-modern-zoom
LabelWithHighlight@DESC_ZOOM_MODIFIER:
Y: 68
Width: PARENT_RIGHT
Height: 16
Font: Small
Text: label-mouse-control-desc-modern-zoom-modifier
LabelWithHighlight@DESC_SCROLL_RIGHT:
Y: 85
Width: PARENT_RIGHT
Height: 16
Font: Small
Text: label-mouse-control-desc-modern-scroll-right
LabelWithHighlight@DESC_SCROLL_MIDDLE:
Y: 85
Width: PARENT_RIGHT
Height: 16
Font: Small
Text: label-mouse-control-desc-modern-scroll-middle
Label@DESC_EDGESCROLL:
X: 9
Y: 102
Width: PARENT_RIGHT
Height: 16
Font: Small
Text: label-mouse-control-desc-modern-edgescroll
Expand Down Expand Up @@ -311,7 +330,8 @@ Container@MAINMENU_SYSTEM_INFO_PROMPT:
Children:
Label@PROMPT_TITLE:
Width: PARENT_RIGHT
Y: 0 - 25
Height: 25
Y: 0 - 37
Font: BigBold
Contrast: true
Align: Center
Expand Down
3 changes: 2 additions & 1 deletion mods/cnc/chrome/mapchooser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ Container@MAPCHOOSER_PANEL:
Children:
Label@TITLE:
Width: PARENT_RIGHT
Y: 0 - 22
Height: 25
Y: 0 - 34
Font: BigBold
Contrast: true
Align: Center
Expand Down