diff --git a/mods/cnc/chrome/assetbrowser.yaml b/mods/cnc/chrome/assetbrowser.yaml index 58463611f5..4215647a2a 100644 --- a/mods/cnc/chrome/assetbrowser.yaml +++ b/mods/cnc/chrome/assetbrowser.yaml @@ -1,8 +1,8 @@ Container@ASSETBROWSER_PANEL: Logic: AssetBrowserLogic SupportedFormats: .shp, .tem, .des, .sno, .jun, .vqa - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 695 Height: 435 Children: @@ -10,7 +10,7 @@ Container@ASSETBROWSER_PANEL: ColorPreviewManager@COLOR_MANAGER: Label@ASSETBROWSER_TITLE: Width: PARENT_RIGHT - Y: 0-25 + Y: 0 - 25 Font: BigBold Contrast: true Align: Center @@ -43,7 +43,7 @@ Container@ASSETBROWSER_PANEL: CollapseHiddenChildren: True Children: ScrollItem@ASSET_TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 @@ -51,7 +51,7 @@ Container@ASSETBROWSER_PANEL: Children: Label@TITLE: X: 10 - Width: PARENT_RIGHT-15 + Width: PARENT_RIGHT - 15 Height: 25 Label@FILENAME_DESC: X: 15 @@ -67,7 +67,7 @@ Container@ASSETBROWSER_PANEL: Width: 160 Height: 25 Label@PALETTE_DESC: - X: PARENT_RIGHT-WIDTH-270 + X: PARENT_RIGHT - WIDTH - 270 Y: 30 Width: 150 Height: 25 @@ -75,13 +75,13 @@ Container@ASSETBROWSER_PANEL: Align: Right Text: Palette: DropDownButton@PALETTE_SELECTOR: - X: PARENT_RIGHT-WIDTH-110 + X: PARENT_RIGHT - WIDTH - 110 Y: 30 Width: 150 Height: 25 Font: Bold DropDownButton@COLOR: - X: PARENT_RIGHT-WIDTH-15 + X: PARENT_RIGHT - WIDTH - 15 Y: 30 Width: 80 Height: 25 @@ -89,8 +89,8 @@ Container@ASSETBROWSER_PANEL: ColorBlock@COLORBLOCK: X: 5 Y: 6 - Width: PARENT_RIGHT-35 - Height: PARENT_BOTTOM-12 + Width: PARENT_RIGHT - 35 + Height: PARENT_BOTTOM - 12 Background@SPRITE_BG: X: 190 Y: 65 diff --git a/mods/cnc/chrome/connection.yaml b/mods/cnc/chrome/connection.yaml index 1527a3f0ae..b535b0aac8 100644 --- a/mods/cnc/chrome/connection.yaml +++ b/mods/cnc/chrome/connection.yaml @@ -1,13 +1,13 @@ Container@CONNECTING_PANEL: Logic: ConnectionLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - 90)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - 90) / 2 Width: 370 Height: 125 Children: Label@TITLE: Width: PARENT_RIGHT - Y: 0-25 + Y: 0 - 25 Font: BigBold Contrast: true Align: Center @@ -18,7 +18,7 @@ Container@CONNECTING_PANEL: Background: panel-black Children: Label@CONNECTING_DESC: - Y: (PARENT_BOTTOM-HEIGHT)/2 + Y: (PARENT_BOTTOM - HEIGHT) / 2 Width: PARENT_RIGHT Height: 25 Text: Connecting... @@ -33,15 +33,15 @@ Container@CONNECTING_PANEL: Container@CONNECTIONFAILED_PANEL: Logic: ConnectionFailedLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - 90)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - 90) / 2 Width: 370 Height: 129 Children: LogicTicker@CONNECTION_FAILED_TICKER: Label@TITLE: Width: PARENT_RIGHT - Y: 0-25 + Y: 0 - 25 Font: BigBold Contrast: true Align: Center @@ -93,14 +93,14 @@ Container@CONNECTIONFAILED_PANEL: Container@CONNECTION_SWITCHMOD_PANEL: Logic: ConnectionSwitchModLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - 90)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - 90) / 2 Width: 370 Height: 134 Children: Label@TITLE: Width: PARENT_RIGHT - Y: 0-25 + Y: 0 - 25 Font: BigBold Contrast: true Align: Center diff --git a/mods/cnc/chrome/credits.yaml b/mods/cnc/chrome/credits.yaml index 936f68f89d..30c8bf09de 100644 --- a/mods/cnc/chrome/credits.yaml +++ b/mods/cnc/chrome/credits.yaml @@ -1,13 +1,13 @@ Container@CREDITS_PANEL: Logic: CreditsLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - 400)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - 400) / 2 Width: 410 Height: 435 Children: Label@CREDITS_TITLE: Width: PARENT_RIGHT - Y: 0-25 + Y: 0 - 25 Font: BigBold Contrast: true Align: Center diff --git a/mods/cnc/chrome/dialogs.yaml b/mods/cnc/chrome/dialogs.yaml index 7b667502db..e677084c08 100644 --- a/mods/cnc/chrome/dialogs.yaml +++ b/mods/cnc/chrome/dialogs.yaml @@ -3,7 +3,7 @@ ScrollPanel@LABEL_DROPDOWN_TEMPLATE: Background: panel-black Children: ScrollItem@HEADER: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 13 X: 2 Y: 0 @@ -15,7 +15,7 @@ ScrollPanel@LABEL_DROPDOWN_TEMPLATE: Height: 10 Align: Center ScrollItem@TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 @@ -23,7 +23,7 @@ ScrollPanel@LABEL_DROPDOWN_TEMPLATE: Children: Label@LABEL: X: 10 - Width: PARENT_RIGHT-20 + Width: PARENT_RIGHT - 20 Height: 25 ScrollPanel@FACTION_DROPDOWN_TEMPLATE: @@ -32,7 +32,7 @@ ScrollPanel@FACTION_DROPDOWN_TEMPLATE: Children: ScrollItem@HEADER: BaseName: scrollheader - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 13 X: 2 Y: 0 @@ -44,7 +44,7 @@ ScrollPanel@FACTION_DROPDOWN_TEMPLATE: Height: 10 Align: Center ScrollItem@TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 @@ -67,7 +67,7 @@ ScrollPanel@TEAM_DROPDOWN_TEMPLATE: Background: panel-black Children: ScrollItem@TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 @@ -84,7 +84,7 @@ ScrollPanel@SPAWN_DROPDOWN_TEMPLATE: Background: panel-black Children: ScrollItem@TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 @@ -101,7 +101,7 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE: Background: panel-black Children: ScrollItem@HEADER: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 13 X: 2 Y: 0 @@ -113,7 +113,7 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE: Height: 10 Align: Center ScrollItem@TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 @@ -136,15 +136,15 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE: Shadow: True Background@THREEBUTTON_PROMPT: - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - 90)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - 90) / 2 Width: 500 Height: 41 Background: panel-black Children: Label@PROMPT_TITLE: Width: PARENT_RIGHT - Y: 0-25 + Y: 0 - 25 Font: BigBold Contrast: true Align: Center @@ -179,15 +179,15 @@ Background@THREEBUTTON_PROMPT: Visible: false Background@TWOBUTTON_PROMPT: - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - 90)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - 90) / 2 Width: 370 Height: 31 Background: panel-black Children: Label@PROMPT_TITLE: Width: PARENT_RIGHT - Y: 0-25 + Y: 0 - 25 Font: BigBold Contrast: true Align: Center @@ -214,14 +214,14 @@ Background@TWOBUTTON_PROMPT: Visible: false Container@TEXT_INPUT_PROMPT: - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 370 Height: 80 Children: Label@PROMPT_TITLE: Width: PARENT_RIGHT - Y: 0-25 + Y: 0 - 25 Font: BigBold Contrast: true Align: Center diff --git a/mods/cnc/chrome/editor.yaml b/mods/cnc/chrome/editor.yaml index 2482d915bf..ba6d04acf6 100644 --- a/mods/cnc/chrome/editor.yaml +++ b/mods/cnc/chrome/editor.yaml @@ -1,7 +1,7 @@ Container@NEW_MAP_BG: Logic: NewMapLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 300 Height: 125 Children: @@ -12,7 +12,7 @@ Container@NEW_MAP_BG: Label@TITLE: Text: New Map Width: PARENT_RIGHT - Y: 0-25 + Y: 0 - 25 Font: BigBold Contrast: true Align: Center @@ -79,15 +79,15 @@ Container@NEW_MAP_BG: Container@SAVE_MAP_PANEL: Logic: SaveMapLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 345 Height: 229 Children: Label@LABEL_TITLE: Text: Save Map Width: PARENT_RIGHT - Y: 0-25 + Y: 0 - 25 Font: BigBold Contrast: true Align: Center @@ -220,7 +220,7 @@ Container@EDITOR_WORLD_ROOT: Height: WINDOW_BOTTOM IgnoreMouseOver: True Background@RADAR_BG: - X: WINDOW_RIGHT-255 + X: WINDOW_RIGHT - 255 Y: 5 Width: 250 Height: 250 @@ -229,12 +229,12 @@ Container@EDITOR_WORLD_ROOT: Radar@INGAME_RADAR: X: 1 Y: 1 - Width: PARENT_RIGHT-2 - Height: PARENT_BOTTOM-2 + Width: PARENT_RIGHT - 2 + Height: PARENT_BOTTOM - 2 MenuButton@OPTIONS_BUTTON: Logic: MenuButtonsChromeLogic Key: escape - X: WINDOW_RIGHT-254-WIDTH + X: WINDOW_RIGHT - 254 - WIDTH Y: 5 Width: 30 Height: 25 @@ -248,10 +248,10 @@ Container@EDITOR_WORLD_ROOT: ImageName: options Container@TILE_WIDGETS: Logic: TileSelectorLogic - X: WINDOW_RIGHT-255 + X: WINDOW_RIGHT - 255 Y: 278 Width: 250 - Height: WINDOW_BOTTOM-370 + Height: WINDOW_BOTTOM - 370 ClickThrough: false Children: Container@TILES_BG: @@ -279,10 +279,10 @@ Container@EDITOR_WORLD_ROOT: Y: 4 Container@LAYER_WIDGETS: Logic: LayerSelectorLogic - X: WINDOW_RIGHT-255 + X: WINDOW_RIGHT - 255 Y: 278 Width: 250 - Height: WINDOW_BOTTOM-370 + Height: WINDOW_BOTTOM - 370 ClickThrough: false Children: Container@LAYERS_BG: @@ -306,10 +306,10 @@ Container@EDITOR_WORLD_ROOT: Visible: false Container@ACTOR_WIDGETS: Logic: ActorSelectorLogic - X: WINDOW_RIGHT-255 + X: WINDOW_RIGHT - 255 Y: 278 Width: 250 - Height: WINDOW_BOTTOM-370 + Height: WINDOW_BOTTOM - 370 ClickThrough: false Children: Container@ACTORS_BG: @@ -340,7 +340,7 @@ Container@EDITOR_WORLD_ROOT: Visible: true Container@MAP_EDITOR_TAB_CONTAINER: Logic: MapEditorTabsLogic - X: WINDOW_RIGHT-255 + X: WINDOW_RIGHT - 255 Y: 254 Width: 250 Height: 25 @@ -390,7 +390,7 @@ Container@EDITOR_WORLD_ROOT: Height: 25 Font: Bold Button@COPYPASTE_BUTTON: - X: WINDOW_RIGHT-390 + X: WINDOW_RIGHT - 390 Y: 5 Width: 96 Height: 25 diff --git a/mods/cnc/chrome/ingame-chat.yaml b/mods/cnc/chrome/ingame-chat.yaml index 09aad67893..3a1fe7d8ee 100644 --- a/mods/cnc/chrome/ingame-chat.yaml +++ b/mods/cnc/chrome/ingame-chat.yaml @@ -6,8 +6,8 @@ Container@CHAT_PANEL: Logic: IngameChatLogic Children: Container@CHAT_OVERLAY: - Width: PARENT_RIGHT-24 - Height: PARENT_BOTTOM-25 + Width: PARENT_RIGHT - 24 + Height: PARENT_BOTTOM - 25 Visible: false Children: ChatDisplay@CHAT_DISPLAY: @@ -52,7 +52,7 @@ Container@CHAT_PANEL: Children: Container@CHAT_TEMPLATE: X: 2 - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 16 Children: Label@NAME: diff --git a/mods/cnc/chrome/ingame-infoscripterror.yaml b/mods/cnc/chrome/ingame-infoscripterror.yaml index 4a6ccaf5fd..efce6b2568 100644 --- a/mods/cnc/chrome/ingame-infoscripterror.yaml +++ b/mods/cnc/chrome/ingame-infoscripterror.yaml @@ -5,7 +5,7 @@ Container@SCRIPT_ERROR_PANEL: Label@DESCA: X: 15 Y: 15 - Width: PARENT_RIGHT-30 + Width: PARENT_RIGHT - 30 Height: 20 Font: Bold Align: Center @@ -13,7 +13,7 @@ Container@SCRIPT_ERROR_PANEL: Label@DESCB: X: 15 Y: 45 - Width: PARENT_RIGHT-30 + Width: PARENT_RIGHT - 30 Height: 20 Font: Regular WordWrap: true @@ -21,7 +21,7 @@ Container@SCRIPT_ERROR_PANEL: Label@DESCC: X: 15 Y: 65 - Width: PARENT_RIGHT-30 + Width: PARENT_RIGHT - 30 Height: 20 Font: Regular Text: Please send this file to the map author so that they can fix this issue. diff --git a/mods/cnc/chrome/ingame-infostats.yaml b/mods/cnc/chrome/ingame-infostats.yaml index fdb274da6a..b9a6eaf83c 100644 --- a/mods/cnc/chrome/ingame-infostats.yaml +++ b/mods/cnc/chrome/ingame-infostats.yaml @@ -67,19 +67,19 @@ Container@SKIRMISH_STATS: Children: Label@TEAM: X: 6 - Y: 0-2 + Y: 0 - 2 Width: 160 Height: 20 Font: Bold Label@TEAM_SCORE: X: 360 - Y: 0-2 + Y: 0 - 2 Width: 75 Height: 20 Font: Bold Align: Right Container@PLAYER_TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Children: diff --git a/mods/cnc/chrome/ingame-menu.yaml b/mods/cnc/chrome/ingame-menu.yaml index 7616ab7434..2629168368 100644 --- a/mods/cnc/chrome/ingame-menu.yaml +++ b/mods/cnc/chrome/ingame-menu.yaml @@ -4,14 +4,14 @@ Container@INGAME_MENU: Logic: IngameMenuLogic Children: Image@EVA: - X: WINDOW_RIGHT-128-43 + X: WINDOW_RIGHT - 128 - 43 Y: 43 Width: 128 Height: 64 ImageCollection: logos ImageName: eva Label@VERSION_LABEL: - X: WINDOW_RIGHT-128-43 + X: WINDOW_RIGHT - 128 - 43 Y: 115 Width: 128 Align: Center @@ -22,8 +22,8 @@ Container@INGAME_MENU: Background: shellmapborder Container@PANEL_ROOT: Container@MENU_BUTTONS: - X: (WINDOW_RIGHT-WIDTH)/2 - Y: WINDOW_BOTTOM-33-HEIGHT-10 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: WINDOW_BOTTOM - 33 - HEIGHT - 10 Width: 740 Height: 35 Children: diff --git a/mods/cnc/chrome/ingame-observerstats.yaml b/mods/cnc/chrome/ingame-observerstats.yaml index 44d7d9a82e..6b48e530cd 100644 --- a/mods/cnc/chrome/ingame-observerstats.yaml +++ b/mods/cnc/chrome/ingame-observerstats.yaml @@ -12,14 +12,14 @@ Background@INGAME_OBSERVERSTATS_BG: Children: Label@TITLE: X: 0 - Y: 0-25 + Y: 0 - 25 Width: PARENT_RIGHT Font: BigBold Align: Center Contrast: True Text: Statistics DropDownButton@STATS_DROPDOWN: - X: PARENT_RIGHT-200 + X: PARENT_RIGHT - 200 Y: 15 Width: 185 Height: 25 @@ -272,15 +272,15 @@ Background@INGAME_OBSERVERSTATS_BG: ScrollPanel@PLAYER_STATS_PANEL: X: 15 Y: 70 - Width: PARENT_RIGHT-30 - Height: PARENT_BOTTOM-35-50 + Width: PARENT_RIGHT - 30 + Height: PARENT_BOTTOM - 35 - 50 TopBottomSpacing: 5 ItemSpacing: 5 Children: ScrollItem@TEAM_TEMPLATE: X: 0 Y: 0 - Width: PARENT_RIGHT-35 + Width: PARENT_RIGHT - 35 Height: 25 Children: Label@TEAM: @@ -292,14 +292,14 @@ Background@INGAME_OBSERVERSTATS_BG: ScrollItem@BASIC_PLAYER_TEMPLATE: X: 0 Y: 0 - Width: PARENT_RIGHT-35 + Width: PARENT_RIGHT - 35 Height: 25 Children: Image@FLAG: X: 20 Y: 5 Width: 35 - Height: PARENT_BOTTOM-5 + Height: PARENT_BOTTOM - 5 ImageName: random ImageCollection: flags Label@PLAYER: @@ -372,14 +372,14 @@ Background@INGAME_OBSERVERSTATS_BG: ScrollItem@ECONOMY_PLAYER_TEMPLATE: X: 0 Y: 0 - Width: PARENT_RIGHT-35 + Width: PARENT_RIGHT - 35 Height: 25 Children: Image@FLAG: X: 20 Y: 5 Width: 35 - Height: PARENT_BOTTOM-5 + Height: PARENT_BOTTOM - 5 ImageName: random ImageCollection: flags Label@PLAYER: @@ -435,14 +435,14 @@ Background@INGAME_OBSERVERSTATS_BG: ScrollItem@PRODUCTION_PLAYER_TEMPLATE: X: 0 Y: 0 - Width: PARENT_RIGHT-35 + Width: PARENT_RIGHT - 35 Height: 25 Children: Image@FLAG: X: 20 Y: 5 Width: 35 - Height: PARENT_BOTTOM-5 + Height: PARENT_BOTTOM - 5 ImageName: random ImageCollection: flags Label@PLAYER: @@ -466,14 +466,14 @@ Background@INGAME_OBSERVERSTATS_BG: ScrollItem@COMBAT_PLAYER_TEMPLATE: X: 0 Y: 0 - Width: PARENT_RIGHT-35 + Width: PARENT_RIGHT - 35 Height: 25 Children: Image@FLAG: X: 20 Y: 5 Width: 35 - Height: PARENT_BOTTOM-5 + Height: PARENT_BOTTOM - 5 ImageName: random ImageCollection: flags Label@PLAYER: @@ -526,8 +526,8 @@ Background@INGAME_OBSERVERSTATS_BG: Container@EARNED_THIS_MIN_GRAPH_TEMPLATE: X: 10 Y: 10 - Width: PARENT_RIGHT-100 - Height: PARENT_BOTTOM-60 + Width: PARENT_RIGHT - 100 + Height: PARENT_BOTTOM - 60 Children: LineGraph@EARNED_THIS_MIN_GRAPH: X: 0 diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml index 95ec3ca692..c7ce8b153f 100644 --- a/mods/cnc/chrome/ingame.yaml +++ b/mods/cnc/chrome/ingame.yaml @@ -11,7 +11,7 @@ Container@INGAME_ROOT: LogicTicker@DISCONNECT_WATCHER: Logic: DisconnectWatcherLogic Label@MISSION_TEXT: - X: WINDOW_RIGHT/2 - 256 + X: WINDOW_RIGHT / 2 - 256 Y: 22 Width: 512 Height: 25 @@ -19,7 +19,7 @@ Container@INGAME_ROOT: Align: Center Contrast: true StrategicProgress@STRATEGIC_PROGRESS: - X: WINDOW_RIGHT/2 + X: WINDOW_RIGHT / 2 Y: 40 Container@PERF_ROOT: WorldInteractionController@INTERACTION_CONTROLLER: @@ -34,7 +34,7 @@ Container@INGAME_ROOT: Height: WINDOW_BOTTOM Container@GAME_TIMER_BLOCK: Logic: GameTimerLogic - X: WINDOW_RIGHT/2 - WIDTH + X: WINDOW_RIGHT / 2 - WIDTH Width: 100 Height: 55 Children: @@ -69,7 +69,7 @@ Container@PERF_WIDGETS: VAlign: Top Background@GRAPH_BG: X: 10 - Y: WINDOW_BOTTOM-HEIGHT-10 + Y: WINDOW_BOTTOM - HEIGHT - 10 Width: 220 Height: 220 Background: panel-black @@ -85,7 +85,7 @@ Container@OBSERVER_WIDGETS: Children: MenuButton@OPTIONS_BUTTON: Key: escape - X: WINDOW_RIGHT-260-WIDTH + X: WINDOW_RIGHT - 260 - WIDTH Y: 5 Width: 30 Height: 25 @@ -100,7 +100,7 @@ Container@OBSERVER_WIDGETS: ImageName: options MenuButton@OBSERVER_STATS_BUTTON: Key: F1 - X: WINDOW_RIGHT-260-WIDTH + X: WINDOW_RIGHT - 260 - WIDTH Y: 35 Width: 30 Height: 25 @@ -116,7 +116,7 @@ Container@OBSERVER_WIDGETS: ImageCollection: order-icons ImageName: stats Background@RADAR: - X: WINDOW_RIGHT-WIDTH-5 + X: WINDOW_RIGHT - WIDTH - 5 Y: 5 Width: 256 Height: 256 @@ -125,11 +125,11 @@ Container@OBSERVER_WIDGETS: Radar: X: 1 Y: 1 - Width: PARENT_RIGHT-2 - Height: PARENT_BOTTOM-2 + Width: PARENT_RIGHT - 2 + Height: PARENT_BOTTOM - 2 Background@REPLAY_PLAYER: Logic: ReplayControlBarLogic - X: WINDOW_RIGHT-WIDTH-5 + X: WINDOW_RIGHT - WIDTH - 5 Y: 283 Width: 256 Height: 46 @@ -187,7 +187,7 @@ Container@OBSERVER_WIDGETS: Text: 100% Font: TinyBold Button@BUTTON_FAST: - X: 57 + 48*2 + X: 57 + 48 * 2 Y: 13 Width: 38 Height: 20 @@ -198,7 +198,7 @@ Container@OBSERVER_WIDGETS: Text: 200% Font: TinyBold Button@BUTTON_MAXIMUM: - X: 57 + 48*3 + X: 57 + 48 * 3 Y: 13 Width: 38 Height: 20 @@ -210,7 +210,7 @@ Container@OBSERVER_WIDGETS: Font: TinyBold DropDownButton@SHROUD_SELECTOR: Logic: ObserverShroudSelectorLogic - X: WINDOW_RIGHT-WIDTH-5 + X: WINDOW_RIGHT - WIDTH - 5 Y: 260 Width: 256 Height: 25 @@ -270,7 +270,7 @@ Container@PLAYER_WIDGETS: MenuButton@OPTIONS_BUTTON: Key: escape X: 22 - Y: 0-24 + Y: 0 - 24 Width: 30 Height: 25 Font: Bold @@ -286,7 +286,7 @@ Container@PLAYER_WIDGETS: Button@BEACON_BUTTON: Logic: BeaconOrderButtonLogic X: 62 - Y: 0-24 + Y: 0 - 24 Width: 30 Height: 25 Font: Bold @@ -300,7 +300,7 @@ Container@PLAYER_WIDGETS: Button@SELL_BUTTON: Logic: SellOrderButtonLogic X: 102 - Y: 0-24 + Y: 0 - 24 Width: 30 Height: 25 Font: Bold @@ -314,7 +314,7 @@ Container@PLAYER_WIDGETS: Button@REPAIR_BUTTON: Logic: RepairOrderButtonLogic X: 142 - Y: 0-24 + Y: 0 - 24 Width: 30 Height: 25 Font: Bold @@ -336,16 +336,16 @@ Container@PLAYER_WIDGETS: Logic: IngameRadarDisplayLogic X: 1 Y: 1 - Width: PARENT_RIGHT-2 - Height: PARENT_BOTTOM-2 + Width: PARENT_RIGHT - 2 + Height: PARENT_BOTTOM - 2 WorldInteractionController: INTERACTION_CONTROLLER Children: LogicTicker@RADAR_TICKER: VqaPlayer@PLAYER: X: 1 Y: 1 - Width: PARENT_RIGHT-2 - Height: PARENT_BOTTOM-2 + Width: PARENT_RIGHT - 2 + Height: PARENT_BOTTOM - 2 Skippable: false Background@POWERBAR_PANEL: Logic: IngamePowerBarLogic @@ -358,8 +358,8 @@ Container@PLAYER_WIDGETS: ResourceBar@POWERBAR: X: 1 Y: 1 - Width: PARENT_RIGHT-2 - Height: PARENT_BOTTOM-2 + Width: PARENT_RIGHT - 2 + Height: PARENT_BOTTOM - 2 TooltipContainer: TOOLTIP_CONTAINER TooltipTemplate: SIMPLE_TOOLTIP IndicatorImage: indicator-left @@ -374,8 +374,8 @@ Container@PLAYER_WIDGETS: ResourceBar@SILOBAR: X: 1 Y: 1 - Width: PARENT_RIGHT-2 - Height: PARENT_BOTTOM-2 + Width: PARENT_RIGHT - 2 + Height: PARENT_BOTTOM - 2 TooltipContainer: TOOLTIP_CONTAINER TooltipTemplate: SIMPLE_TOOLTIP IndicatorImage: indicator-right diff --git a/mods/cnc/chrome/lobby-globalchat.yaml b/mods/cnc/chrome/lobby-globalchat.yaml index abc1e086d0..29f4d7dac2 100644 --- a/mods/cnc/chrome/lobby-globalchat.yaml +++ b/mods/cnc/chrome/lobby-globalchat.yaml @@ -14,7 +14,7 @@ Container@LOBBY_GLOBALCHAT_PANEL: Children: Label@CHANNEL_TOPIC: X: 10 - Y: 0-1 + Y: 0 - 1 Width: PARENT_RIGHT - 20 Height: PARENT_BOTTOM Font: TinyBold @@ -58,7 +58,7 @@ Container@LOBBY_GLOBALCHAT_PANEL: LeftMargin: 60 Children: Label@LABEL_CHATTYPE: - Y: 0-1 + Y: 0 - 1 Width: 55 Height: 25 Align: Right @@ -70,7 +70,7 @@ Container@LOBBY_GLOBALCHAT_PANEL: Children: Container@NICKNAME_TEMPLATE: Height: 20 - Width: PARENT_RIGHT-25 + Width: PARENT_RIGHT - 25 Children: Image@INDICATOR: ImageCollection: lobby-bits @@ -79,7 +79,7 @@ Container@LOBBY_GLOBALCHAT_PANEL: Y: 9 Label@NICK: X: 15 - Width: PARENT_RIGHT-15 + Width: PARENT_RIGHT - 15 Height: 20 Button@DISCONNECT_BUTTON: X: 596 @@ -131,7 +131,7 @@ Container@LOBBY_GLOBALCHAT_PANEL: Disabled: true Children: Label@LABEL_CHATTYPE: - Y: 0-1 + Y: 0 - 1 Width: 55 Height: 25 Align: Right diff --git a/mods/cnc/chrome/lobby-kickdialogs.yaml b/mods/cnc/chrome/lobby-kickdialogs.yaml index 0a5693536e..47a22d7d8a 100644 --- a/mods/cnc/chrome/lobby-kickdialogs.yaml +++ b/mods/cnc/chrome/lobby-kickdialogs.yaml @@ -25,21 +25,21 @@ Background@KICK_CLIENT_DIALOG: Align: Center Text: them from joining for the remainder of this game. Checkbox@PREVENT_REJOINING_CHECKBOX: - X: (PARENT_RIGHT - WIDTH)/2 + X: (PARENT_RIGHT - WIDTH) / 2 Y: 120 Width: 150 Height: 20 Font: Regular Text: Temporarily Ban Button@OK_BUTTON: - X: (PARENT_RIGHT - WIDTH)/2 + 75 + X: (PARENT_RIGHT - WIDTH) / 2 + 75 Y: 155 Width: 120 Height: 25 Text: Kick Font: Bold Button@CANCEL_BUTTON: - X: (PARENT_RIGHT - WIDTH)/2 - 75 + X: (PARENT_RIGHT - WIDTH) / 2 - 75 Y: 155 Width: 120 Height: 25 @@ -66,14 +66,14 @@ Background@KICK_SPECTATORS_DIALOG: Font: Regular Align: Center Button@OK_BUTTON: - X: (PARENT_RIGHT - WIDTH)/2 + 75 + X: (PARENT_RIGHT - WIDTH) / 2 + 75 Y: 155 Width: 120 Height: 25 Text: Ok Font: Bold Button@CANCEL_BUTTON: - X: (PARENT_RIGHT - WIDTH)/2 - 75 + X: (PARENT_RIGHT - WIDTH) / 2 - 75 Y: 155 Width: 120 Height: 25 @@ -126,14 +126,14 @@ Background@FORCE_START_DIALOG: Align: Center Text: map, and will be kicked from the server. Button@OK_BUTTON: - X: (PARENT_RIGHT - WIDTH)/2 + 75 + X: (PARENT_RIGHT - WIDTH) / 2 + 75 Y: 155 Width: 120 Height: 25 Text: Start Font: Bold Button@CANCEL_BUTTON: - X: (PARENT_RIGHT - WIDTH)/2 - 75 + X: (PARENT_RIGHT - WIDTH) / 2 - 75 Y: 155 Width: 120 Height: 25 diff --git a/mods/cnc/chrome/lobby-mappreview.yaml b/mods/cnc/chrome/lobby-mappreview.yaml index d4098190b5..1739a0907f 100644 --- a/mods/cnc/chrome/lobby-mappreview.yaml +++ b/mods/cnc/chrome/lobby-mappreview.yaml @@ -15,8 +15,8 @@ Container@LOBBY_MAP_PREVIEW: MapPreview@MAP_PREVIEW: X: 1 Y: 1 - Width: PARENT_RIGHT-2 - Height: PARENT_BOTTOM-2 + Width: PARENT_RIGHT - 2 + Height: PARENT_BOTTOM - 2 TooltipContainer: TOOLTIP_CONTAINER LabelWithTooltip@MAP_TITLE: Y: 172 @@ -51,8 +51,8 @@ Container@LOBBY_MAP_PREVIEW: MapPreview@MAP_PREVIEW: X: 1 Y: 1 - Width: PARENT_RIGHT-2 - Height: PARENT_BOTTOM-2 + Width: PARENT_RIGHT - 2 + Height: PARENT_BOTTOM - 2 TooltipContainer: TOOLTIP_CONTAINER Label@MAP_TITLE: Y: 172 @@ -86,8 +86,8 @@ Container@LOBBY_MAP_PREVIEW: MapPreview@MAP_PREVIEW: X: 1 Y: 1 - Width: PARENT_RIGHT-2 - Height: PARENT_BOTTOM-2 + Width: PARENT_RIGHT - 2 + Height: PARENT_BOTTOM - 2 TooltipContainer: TOOLTIP_CONTAINER Label@MAP_TITLE: Y: 142 @@ -124,8 +124,8 @@ Container@LOBBY_MAP_PREVIEW: MapPreview@MAP_PREVIEW: X: 1 Y: 1 - Width: PARENT_RIGHT-2 - Height: PARENT_BOTTOM-2 + Width: PARENT_RIGHT - 2 + Height: PARENT_BOTTOM - 2 TooltipContainer: TOOLTIP_CONTAINER Label@MAP_TITLE: Y: 142 diff --git a/mods/cnc/chrome/lobby-music.yaml b/mods/cnc/chrome/lobby-music.yaml index e769eb804b..e368de5ba5 100644 --- a/mods/cnc/chrome/lobby-music.yaml +++ b/mods/cnc/chrome/lobby-music.yaml @@ -5,7 +5,7 @@ Container@LOBBY_MUSIC_BIN: Children: LogicTicker@SONG_WATCHER: Container@LABEL_CONTAINER: - Y: 0-25 + Y: 0 - 25 Width: PARENT_RIGHT Children: Label@MUSIC: @@ -21,7 +21,7 @@ Container@LOBBY_MUSIC_BIN: Text: Track Font: Bold Label@TYPE: - X: PARENT_RIGHT-63 + X: PARENT_RIGHT - 63 Height: 25 Width: 50 Text: Length @@ -126,7 +126,7 @@ Container@LOBBY_MUSIC_BIN: Font: Regular Text: Shuffle Checkbox@REPEAT: - X: PARENT_RIGHT-15-WIDTH + X: PARENT_RIGHT - 15 - WIDTH Y: 150 Width: 70 Height: 20 @@ -146,51 +146,51 @@ Container@LOBBY_MUSIC_BIN: Ticks: 5 ScrollPanel@MUSIC_LIST: X: 307 - Width: PARENT_RIGHT-307 + Width: PARENT_RIGHT - 307 Height: PARENT_BOTTOM Children: ScrollItem@MUSIC_TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Visible: false Children: Label@TITLE: X: 10 - Width: PARENT_RIGHT-50 + Width: PARENT_RIGHT - 50 Height: 25 Label@LENGTH: - X: PARENT_RIGHT-60 + X: PARENT_RIGHT - 60 Width: 50 Height: 25 Align: Right Container@NO_MUSIC_LABEL: X: 307 - Width: PARENT_RIGHT-307 + Width: PARENT_RIGHT - 307 Visible: false Children: Label@TITLE: Y: 65 - Width: PARENT_RIGHT-24 + Width: PARENT_RIGHT - 24 Height: 25 Font: Bold Align: Center Text: Music Not Installed Label@DESCA: Y: 85 - Width: PARENT_RIGHT-24 + Width: PARENT_RIGHT - 24 Height: 25 Align: Center Text: The game music can be installed Label@DESCB: Y: 105 - Width: PARENT_RIGHT-24 + Width: PARENT_RIGHT - 24 Height: 25 Align: Center Text: from the "Manage Content" menu Label@DESCC: Y: 125 - Width: PARENT_RIGHT-24 + Width: PARENT_RIGHT - 24 Height: 25 Align: Center Text: in the mod chooser. diff --git a/mods/cnc/chrome/lobby-options.yaml b/mods/cnc/chrome/lobby-options.yaml index eec77b7ad0..35af18e339 100644 --- a/mods/cnc/chrome/lobby-options.yaml +++ b/mods/cnc/chrome/lobby-options.yaml @@ -13,8 +13,8 @@ Background@LOBBY_OPTIONS_BIN: Container: X: 30 Y: 30 - Width: PARENT_RIGHT-60 - Height: PARENT_BOTTOM-75 + Width: PARENT_RIGHT - 60 + Height: PARENT_BOTTOM - 75 Children: Checkbox@EXPLORED_MAP_CHECKBOX: Width: 150 diff --git a/mods/cnc/chrome/lobby-players.yaml b/mods/cnc/chrome/lobby-players.yaml index 1d992f3431..3313669f83 100644 --- a/mods/cnc/chrome/lobby-players.yaml +++ b/mods/cnc/chrome/lobby-players.yaml @@ -4,7 +4,7 @@ Container@LOBBY_PLAYER_BIN: Children: Container@LABEL_CONTAINER: X: 5 - Y: 0-25 + Y: 0 - 25 Width: PARENT_RIGHT Height: PARENT_BOTTOM Children: @@ -76,8 +76,8 @@ Container@LOBBY_PLAYER_BIN: ColorBlock@LATENCY_COLOR: X: 2 Y: 2 - Width: PARENT_RIGHT-4 - Height: PARENT_BOTTOM-4 + Width: PARENT_RIGHT - 4 + Height: PARENT_BOTTOM - 4 ClientTooltipRegion@CLIENT_REGION: Width: 11 Height: 25 @@ -107,8 +107,8 @@ Container@LOBBY_PLAYER_BIN: ColorBlock@COLORBLOCK: X: 5 Y: 6 - Width: PARENT_RIGHT-35 - Height: PARENT_BOTTOM-12 + Width: PARENT_RIGHT - 35 + Height: PARENT_BOTTOM - 12 DropDownButton@FACTION: X: 291 Width: 120 @@ -174,8 +174,8 @@ Container@LOBBY_PLAYER_BIN: ColorBlock@LATENCY_COLOR: X: 2 Y: 2 - Width: PARENT_RIGHT-4 - Height: PARENT_BOTTOM-4 + Width: PARENT_RIGHT - 4 + Height: PARENT_BOTTOM - 4 ClientTooltipRegion@CLIENT_REGION: Width: 11 Height: 25 @@ -183,7 +183,7 @@ Container@LOBBY_PLAYER_BIN: Template: CLIENT_TOOLTIP Label@NAME: X: 20 - Y: 0-1 + Y: 0 - 1 Width: 180 Height: 25 Button@KICK: @@ -249,7 +249,7 @@ Container@LOBBY_PLAYER_BIN: Visible: false Label@NAME: X: 20 - Y: 0-1 + Y: 0 - 1 Width: 195 Height: 25 Visible: false @@ -280,8 +280,8 @@ Container@LOBBY_PLAYER_BIN: ColorBlock@LATENCY_COLOR: X: 2 Y: 2 - Width: PARENT_RIGHT-4 - Height: PARENT_BOTTOM-4 + Width: PARENT_RIGHT - 4 + Height: PARENT_BOTTOM - 4 ClientTooltipRegion@CLIENT_REGION: Width: 11 Height: 25 @@ -335,8 +335,8 @@ Container@LOBBY_PLAYER_BIN: ColorBlock@LATENCY_COLOR: X: 2 Y: 2 - Width: PARENT_RIGHT-4 - Height: PARENT_BOTTOM-4 + Width: PARENT_RIGHT - 4 + Height: PARENT_BOTTOM - 4 ClientTooltipRegion@CLIENT_REGION: Width: 11 Height: 25 @@ -344,7 +344,7 @@ Container@LOBBY_PLAYER_BIN: Template: CLIENT_TOOLTIP Label@NAME: X: 20 - Y: 0-1 + Y: 0 - 1 Width: 180 Height: 25 Button@KICK: diff --git a/mods/cnc/chrome/lobby.yaml b/mods/cnc/chrome/lobby.yaml index fb5eaf7178..a45769064f 100644 --- a/mods/cnc/chrome/lobby.yaml +++ b/mods/cnc/chrome/lobby.yaml @@ -1,14 +1,14 @@ Container@SERVER_LOBBY: Logic: LobbyLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - 560)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - 560) / 2 Width: 800 Height: 575 Children: ColorPreviewManager@COLOR_MANAGER: Label@SERVER_NAME: Width: PARENT_RIGHT - Y: 0-25 + Y: 0 - 25 Font: BigBold Contrast: true Align: Center @@ -18,7 +18,7 @@ Container@SERVER_LOBBY: Background: panel-black Children: Container@MAP_PREVIEW_ROOT: - X: PARENT_RIGHT-15-WIDTH + X: PARENT_RIGHT - 15 - WIDTH Y: 30 Width: 174 Height: 250 @@ -82,7 +82,7 @@ Container@SERVER_LOBBY: ItemSpacing: 2 Children: Container@CHAT_TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 16 X: 2 Y: 0 @@ -114,7 +114,7 @@ Container@SERVER_LOBBY: LeftMargin: 50 Children: Label@LABEL_CHATTYPE: - Y: 0-1 + Y: 0 - 1 Width: 45 Height: 25 Align: Right diff --git a/mods/cnc/chrome/mainmenu.yaml b/mods/cnc/chrome/mainmenu.yaml index 3d1ec8045d..447aa2c676 100644 --- a/mods/cnc/chrome/mainmenu.yaml +++ b/mods/cnc/chrome/mainmenu.yaml @@ -10,24 +10,24 @@ Container@MENU_BACKGROUND: Container@SHELLMAP_DECORATIONS: Children: Image@NOD: - X: WINDOW_RIGHT/2-384 - Y: (WINDOW_BOTTOM-256)/2 + X: WINDOW_RIGHT / 2 - 384 + Y: (WINDOW_BOTTOM - 256) / 2 ImageCollection: logos ImageName: nod-load Image@GDI: - X: WINDOW_RIGHT/2+128 - Y: (WINDOW_BOTTOM-256)/2 + X: WINDOW_RIGHT / 2 + 128 + Y: (WINDOW_BOTTOM - 256) / 2 ImageCollection: logos ImageName: gdi-load Image@EVA: - X: WINDOW_RIGHT-128-43 + X: WINDOW_RIGHT - 128 - 43 Y: 43 Width: 128 Height: 64 ImageCollection: logos ImageName: eva Label@VERSION_LABEL: - X: WINDOW_RIGHT-128-43 + X: WINDOW_RIGHT - 128 - 43 Y: 115 Width: 128 Align: Center @@ -37,8 +37,8 @@ Container@MENU_BACKGROUND: Height: WINDOW_BOTTOM Background: shellmapborder Container@MENUS: - X: (WINDOW_RIGHT-WIDTH)/2 - Y: WINDOW_BOTTOM-33-HEIGHT-10 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: WINDOW_BOTTOM - 33 - HEIGHT - 10 Width: 890 Height: 35 Children: @@ -47,7 +47,7 @@ Container@MENU_BACKGROUND: Children: Label@MAINMENU_LABEL_TITLE: X: 0 - Y: 0-30 + Y: 0 - 30 Width: PARENT_RIGHT Height: 20 Text: Main Menu @@ -96,7 +96,7 @@ Container@MENU_BACKGROUND: Children: Label@SINGLEPLAYER_MENU_TITLE: X: 0 - Y: 0-30 + Y: 0 - 30 Width: PARENT_RIGHT Height: 20 Text: Singleplayer @@ -128,7 +128,7 @@ Container@MENU_BACKGROUND: Children: Label@EXTRAS_MENU_TITLE: X: 0 - Y: 0-30 + Y: 0 - 30 Width: PARENT_RIGHT Height: 20 Text: Extras @@ -179,7 +179,7 @@ Container@MENU_BACKGROUND: Children: Label@MAP_EDITOR_MENU_TITLE: X: 0 - Y: 0-30 + Y: 0 - 30 Width: PARENT_RIGHT Height: 20 Text: Map Editor @@ -209,14 +209,14 @@ Container@MENU_BACKGROUND: Font: Bold Key: escape Container@SYSTEM_INFO_PROMPT: - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 490 Height: 222 Children: Label@TITLE: Width: PARENT_RIGHT - Y: 0-25 + Y: 0 - 25 Font: BigBold Contrast: true Align: Center @@ -271,7 +271,7 @@ Container@MENU_BACKGROUND: Container@NEWS_BG: Children: DropDownButton@NEWS_BUTTON: - X: (WINDOW_RIGHT - WIDTH)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 Y: 50 Width: 400 Height: 25 @@ -288,7 +288,7 @@ Container@MENU_BACKGROUND: Contrast: true VAlign: Top Background@GRAPH_BG: - X: WINDOW_RIGHT-WIDTH-31 + X: WINDOW_RIGHT - WIDTH - 31 Y: 31 Width: 220 Height: 220 diff --git a/mods/cnc/chrome/mapchooser.yaml b/mods/cnc/chrome/mapchooser.yaml index 9f6349a8b5..718e1dba55 100644 --- a/mods/cnc/chrome/mapchooser.yaml +++ b/mods/cnc/chrome/mapchooser.yaml @@ -1,13 +1,13 @@ Container@MAPCHOOSER_PANEL: Logic: MapChooserLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - 560)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - 560) / 2 Width: 800 Height: 575 Children: Label@TITLE: Width: PARENT_RIGHT - Y: 0-25 + Y: 0 - 25 Font: BigBold Contrast: true Align: Center @@ -82,7 +82,7 @@ Container@MAPCHOOSER_PANEL: Visible: false Children: MapPreview@PREVIEW: - X: (PARENT_RIGHT - WIDTH)/2 + X: (PARENT_RIGHT - WIDTH) / 2 Y: 4 Width: 173 Height: 173 @@ -90,25 +90,25 @@ Container@MAPCHOOSER_PANEL: IgnoreMouseInput: true Label@TITLE: X: 4 - Y: PARENT_BOTTOM-48 - Width: PARENT_RIGHT-8 + Y: PARENT_BOTTOM - 48 + Width: PARENT_RIGHT - 8 Align: Center Label@DETAILS: - Width: PARENT_RIGHT-8 + Width: PARENT_RIGHT - 8 X: 4 - Y: PARENT_BOTTOM-34 + Y: PARENT_BOTTOM - 34 Align: Center Font: Tiny Label@AUTHOR: - Width: PARENT_RIGHT-8 + Width: PARENT_RIGHT - 8 X: 4 - Y: PARENT_BOTTOM-22 + Y: PARENT_BOTTOM - 22 Align: Center Font: Tiny Label@SIZE: - Width: PARENT_RIGHT-8 + Width: PARENT_RIGHT - 8 X: 4 - Y: PARENT_BOTTOM-10 + Y: PARENT_BOTTOM - 10 Align: Center Font: Tiny Button@BUTTON_CANCEL: diff --git a/mods/cnc/chrome/missionbrowser.yaml b/mods/cnc/chrome/missionbrowser.yaml index 72672c9acb..c0b839c055 100644 --- a/mods/cnc/chrome/missionbrowser.yaml +++ b/mods/cnc/chrome/missionbrowser.yaml @@ -1,12 +1,12 @@ Container@MISSIONBROWSER_PANEL: Logic: MissionBrowserLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 714 Height: 420 Children: Label@MISSIONBROWSER_TITLE: - Y: 0-25 + Y: 0 - 25 Width: PARENT_RIGHT Text: Missions Align: Center @@ -24,7 +24,7 @@ Container@MISSIONBROWSER_PANEL: Height: 390 Children: ScrollItem@HEADER: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 13 X: 2 Visible: false @@ -35,14 +35,14 @@ Container@MISSIONBROWSER_PANEL: Height: 10 Align: Center ScrollItem@TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Visible: False Children: Label@TITLE: X: 10 - Width: PARENT_RIGHT-20 + Width: PARENT_RIGHT - 20 Height: 25 Container@MISSION_INFO: X: 337 @@ -58,8 +58,8 @@ Container@MISSIONBROWSER_PANEL: MapPreview@MISSION_PREVIEW: X: 1 Y: 1 - Width: PARENT_RIGHT-2 - Height: PARENT_BOTTOM-2 + Width: PARENT_RIGHT - 2 + Height: PARENT_BOTTOM - 2 IgnoreMouseOver: True IgnoreMouseInput: True ShowSpawnPoints: False diff --git a/mods/cnc/chrome/multiplayer-browser.yaml b/mods/cnc/chrome/multiplayer-browser.yaml index 0b7ccb5015..35ea13d13f 100644 --- a/mods/cnc/chrome/multiplayer-browser.yaml +++ b/mods/cnc/chrome/multiplayer-browser.yaml @@ -39,19 +39,19 @@ Container@MULTIPLAYER_BROWSER_PANEL: TopBottomSpacing: 2 Children: ScrollItem@HEADER_TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 20 X: 2 Visible: false Children: Label@LABEL: - Y: 0-1 + Y: 0 - 1 Font: TinyBold Width: PARENT_RIGHT Height: 20 Align: Center ScrollItem@SERVER_TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Children: @@ -85,7 +85,7 @@ Container@MULTIPLAYER_BROWSER_PANEL: Align: Center Visible: false Container@SELECTED_SERVER: - X: PARENT_RIGHT-WIDTH + X: PARENT_RIGHT - WIDTH Y: 30 Width: 174 Height: 280 @@ -98,8 +98,8 @@ Container@MULTIPLAYER_BROWSER_PANEL: MapPreview@SELECTED_MAP_PREVIEW: X: 1 Y: 1 - Width: PARENT_RIGHT-2 - Height: PARENT_BOTTOM-2 + Width: PARENT_RIGHT - 2 + Height: PARENT_BOTTOM - 2 TooltipContainer: TOOLTIP_CONTAINER Label@SELECTED_MAP: Y: 172 diff --git a/mods/cnc/chrome/multiplayer-createserver.yaml b/mods/cnc/chrome/multiplayer-createserver.yaml index 053c080102..5d6ef78af1 100644 --- a/mods/cnc/chrome/multiplayer-createserver.yaml +++ b/mods/cnc/chrome/multiplayer-createserver.yaml @@ -111,7 +111,7 @@ Container@MULTIPLAYER_CREATESERVER_PANEL: WordWrap: True Text: Your router does not seem to support UPnP. Please consult your router's manual. Container@SIDEBAR: - X: PARENT_RIGHT-WIDTH + X: PARENT_RIGHT - WIDTH Y: 30 Width: 174 Height: 280 @@ -134,7 +134,7 @@ Container@MULTIPLAYER_CREATESERVER_PANEL: Align: Center Button@MAP_BUTTON: X: PARENT_RIGHT - WIDTH - Y: 284-30 + Y: 284 - 30 Width: 174 Height: 25 Text: Choose Map diff --git a/mods/cnc/chrome/multiplayer-directconnect.yaml b/mods/cnc/chrome/multiplayer-directconnect.yaml index 5d54a63e09..31b7a30759 100644 --- a/mods/cnc/chrome/multiplayer-directconnect.yaml +++ b/mods/cnc/chrome/multiplayer-directconnect.yaml @@ -42,7 +42,7 @@ Container@MULTIPLAYER_DIRECTCONNECT_PANEL: Height: 25 MaxLength: 5 Container@SIDEBAR: - X: PARENT_RIGHT-WIDTH + X: PARENT_RIGHT - WIDTH Y: 30 Width: 174 Height: 280 diff --git a/mods/cnc/chrome/multiplayer-globalchat.yaml b/mods/cnc/chrome/multiplayer-globalchat.yaml index c6350d2f01..7bdc4da19f 100644 --- a/mods/cnc/chrome/multiplayer-globalchat.yaml +++ b/mods/cnc/chrome/multiplayer-globalchat.yaml @@ -14,7 +14,7 @@ Container@GLOBALCHAT_PANEL: Children: Label@CHANNEL_TOPIC: X: 10 - Y: 0-1 + Y: 0 - 1 Width: PARENT_RIGHT - 20 Height: PARENT_BOTTOM Font: TinyBold @@ -57,19 +57,19 @@ Container@GLOBALCHAT_PANEL: LeftMargin: 60 Children: Label@LABEL_CHATTYPE: - Y: 0-1 + Y: 0 - 1 Width: 55 Height: 25 Align: Right Text: Global: ScrollPanel@NICKNAME_PANEL: - X: PARENT_RIGHT-WIDTH + X: PARENT_RIGHT - WIDTH Width: 174 Height: PARENT_BOTTOM - 30 Children: Container@NICKNAME_TEMPLATE: Height: 20 - Width: PARENT_RIGHT-25 + Width: PARENT_RIGHT - 25 Children: Image@INDICATOR: ImageCollection: lobby-bits @@ -78,10 +78,10 @@ Container@GLOBALCHAT_PANEL: Y: 9 Label@NICK: X: 15 - Width: PARENT_RIGHT-15 + Width: PARENT_RIGHT - 15 Height: 20 Button@DISCONNECT_BUTTON: - X: PARENT_RIGHT-WIDTH + X: PARENT_RIGHT - WIDTH Y: PARENT_BOTTOM - 25 Width: 174 Height: 25 diff --git a/mods/cnc/chrome/multiplayer.yaml b/mods/cnc/chrome/multiplayer.yaml index f3e2cf02a9..18c34b0ce8 100644 --- a/mods/cnc/chrome/multiplayer.yaml +++ b/mods/cnc/chrome/multiplayer.yaml @@ -1,14 +1,14 @@ Container@MULTIPLAYER_PANEL: Logic: MultiplayerLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - 560)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - 560) / 2 Width: 800 Height: 575 Children: Label@TITLE: Text: Multiplayer Width: PARENT_RIGHT - Y: 0-25 + Y: 0 - 25 Font: BigBold Contrast: true Align: Center @@ -73,7 +73,7 @@ ScrollPanel@MULTIPLAYER_FILTER_PANEL: Checkbox@WAITING_FOR_PLAYERS: X: 5 Y: 5 - Width: PARENT_RIGHT-29 + Width: PARENT_RIGHT - 29 Height: 20 Text: Waiting TextColor: 32CD32 @@ -81,14 +81,14 @@ ScrollPanel@MULTIPLAYER_FILTER_PANEL: Checkbox@EMPTY: X: 5 Y: 30 - Width: PARENT_RIGHT-29 + Width: PARENT_RIGHT - 29 Height: 20 Text: Empty Font: Regular Checkbox@PASSWORD_PROTECTED: X: 5 Y: 55 - Width: PARENT_RIGHT-29 + Width: PARENT_RIGHT - 29 Height: 20 Text: Protected TextColor: FF0000 @@ -96,7 +96,7 @@ ScrollPanel@MULTIPLAYER_FILTER_PANEL: Checkbox@ALREADY_STARTED: X: 5 Y: 80 - Width: PARENT_RIGHT-29 + Width: PARENT_RIGHT - 29 Height: 20 Text: Started TextColor: FFA500 @@ -104,7 +104,7 @@ ScrollPanel@MULTIPLAYER_FILTER_PANEL: Checkbox@INCOMPATIBLE_VERSION: X: 5 Y: 105 - Width: PARENT_RIGHT-29 + Width: PARENT_RIGHT - 29 Height: 20 Text: Incompatible TextColor: BEBEBE diff --git a/mods/cnc/chrome/music.yaml b/mods/cnc/chrome/music.yaml index 8ff911e887..c643f23909 100644 --- a/mods/cnc/chrome/music.yaml +++ b/mods/cnc/chrome/music.yaml @@ -1,14 +1,14 @@ Container@MUSIC_PANEL: Logic: MusicPlayerLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - 400)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - 400) / 2 Width: 360 Height: 435 Children: LogicTicker@SONG_WATCHER: Label@TITLE: Width: 360 - Y: 0-25 + Y: 0 - 25 Font: BigBold Contrast: true Align: Center @@ -25,7 +25,7 @@ Container@MUSIC_PANEL: Height: 275 Children: ScrollItem@MUSIC_TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 @@ -33,11 +33,11 @@ Container@MUSIC_PANEL: Children: Label@TITLE: X: 10 - Width: PARENT_RIGHT-50 + Width: PARENT_RIGHT - 50 Height: 25 Label@LENGTH: Width: 50 - X: PARENT_RIGHT-60 + X: PARENT_RIGHT - 60 Align: Right Height: 25 Container@LABEL_CONTAINER: @@ -52,7 +52,7 @@ Container@MUSIC_PANEL: Align: Center Font: Bold Label@TYPE: - X: PARENT_RIGHT-85 + X: PARENT_RIGHT - 85 Height: 25 Width: 50 Text: Length @@ -60,7 +60,7 @@ Container@MUSIC_PANEL: Font: Bold Container@BUTTONS: X: 15 - Y: PARENT_BOTTOM-HEIGHT-40 + Y: PARENT_BOTTOM - HEIGHT - 40 Width: 170 Children: Button@BUTTON_PREV: @@ -135,7 +135,7 @@ Container@MUSIC_PANEL: Height: 20 Ticks: 5 Label@TIME_LABEL: - X: (PARENT_RIGHT-WIDTH)/2 + X: (PARENT_RIGHT - WIDTH) / 2 Y: 315 Width: 140 Height: 25 @@ -148,7 +148,7 @@ Container@MUSIC_PANEL: Font: Regular Text: Shuffle Checkbox@REPEAT: - X: PARENT_RIGHT-15-WIDTH + X: PARENT_RIGHT - 15 - WIDTH Y: 320 Width: 70 Height: 20 @@ -162,26 +162,26 @@ Container@MUSIC_PANEL: Visible: false Children: Label@TITLE: - Width: PARENT_RIGHT-24 + Width: PARENT_RIGHT - 24 Height: 25 Font: Bold Align: Center Text: Music Not Installed Label@DESCA: Y: 20 - Width: PARENT_RIGHT-24 + Width: PARENT_RIGHT - 24 Height: 25 Align: Center Text: The game music can be installed Label@DESCB: Y: 40 - Width: PARENT_RIGHT-24 + Width: PARENT_RIGHT - 24 Height: 25 Align: Center Text: from the "Manage Content" menu Label@DESCC: Y: 60 - Width: PARENT_RIGHT-24 + Width: PARENT_RIGHT - 24 Height: 25 Align: Center Text: in the mod chooser. diff --git a/mods/cnc/chrome/replaybrowser.yaml b/mods/cnc/chrome/replaybrowser.yaml index 7ea5e3f115..8c46252a52 100644 --- a/mods/cnc/chrome/replaybrowser.yaml +++ b/mods/cnc/chrome/replaybrowser.yaml @@ -1,13 +1,13 @@ Container@REPLAYBROWSER_PANEL: Logic: ReplayBrowserLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 780 Height: 500 Children: Label@TITLE: Width: PARENT_RIGHT - Y: 0-25 + Y: 0 - 25 Font: BigBold Contrast: true Align: Center @@ -184,14 +184,14 @@ Container@REPLAYBROWSER_PANEL: CollapseHiddenChildren: True Children: ScrollItem@REPLAY_TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Visible: false Children: Label@TITLE: X: 10 - Width: PARENT_RIGHT-20 + Width: PARENT_RIGHT - 20 Height: 25 Container@MAP_BG_CONTAINER: X: PARENT_RIGHT - WIDTH - 20 @@ -219,9 +219,9 @@ Container@REPLAYBROWSER_PANEL: TooltipContainer: TOOLTIP_CONTAINER Container@REPLAY_INFO: X: PARENT_RIGHT - WIDTH - 20 - Y: 20 + 30+194 + 10 + Y: 20 + 30 + 194 + 10 Width: 194 - Height: PARENT_BOTTOM - 20 - 30-194 - 10 - 20 + Height: PARENT_BOTTOM - 20 - 30 - 194 - 10 - 20 Children: Label@MAP_TITLE: Y: 0 @@ -248,7 +248,7 @@ Container@REPLAYBROWSER_PANEL: IgnoreChildMouseOver: true Children: ScrollItem@HEADER: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 13 X: 2 Y: 0 @@ -260,7 +260,7 @@ Container@REPLAYBROWSER_PANEL: Height: 10 Align: Center ScrollItem@TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 @@ -273,7 +273,7 @@ Container@REPLAYBROWSER_PANEL: Height: 16 Label@LABEL: X: 40 - Width: PARENT_RIGHT-50 + Width: PARENT_RIGHT - 50 Height: 25 Shadow: True Label@NOFLAG_LABEL: diff --git a/mods/cnc/chrome/settings.yaml b/mods/cnc/chrome/settings.yaml index afed569054..e96f300622 100644 --- a/mods/cnc/chrome/settings.yaml +++ b/mods/cnc/chrome/settings.yaml @@ -1,13 +1,13 @@ Container@SETTINGS_PANEL: Logic: SettingsLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 590 Height: 378 Children: Label@TITLE: Width: 590 - Y: 0-25 + Y: 0 - 25 Font: BigBold Contrast: true Align: Center @@ -70,7 +70,7 @@ Container@SETTINGS_PANEL: Label@At: Text: @ Font: Bold - Y: 0-1 + Y: 0 - 1 Height: 25 Width: 25 Align: Center @@ -83,7 +83,7 @@ Container@SETTINGS_PANEL: Text: x Font: Bold X: 70 - Y: 0-1 + Y: 0 - 1 Height: 25 Width: 15 Align: Center @@ -174,8 +174,8 @@ Container@SETTINGS_PANEL: ColorBlock@COLORBLOCK: X: 5 Y: 6 - Width: PARENT_RIGHT-35 - Height: PARENT_BOTTOM-12 + Width: PARENT_RIGHT - 35 + Height: PARENT_BOTTOM - 12 Label@STATUS_BARS: X: 310 Y: 255 @@ -455,12 +455,12 @@ Container@SETTINGS_PANEL: Visible: false Children: Label@FUNCTION: - Y: 0-1 + Y: 0 - 1 Width: PARENT_RIGHT - 85 Height: 25 Align: Right HotkeyEntry@HOTKEY: - X: PARENT_RIGHT-WIDTH + X: PARENT_RIGHT - WIDTH Width: 80 Height: 25 Container@UNIT_TEMPLATE: @@ -469,12 +469,12 @@ Container@SETTINGS_PANEL: Visible: false Children: Label@FUNCTION: - Y: 0-1 + Y: 0 - 1 Width: PARENT_RIGHT - 84 Height: 25 Align: Right HotkeyEntry@HOTKEY: - X: PARENT_RIGHT-WIDTH+1 + X: PARENT_RIGHT - WIDTH + 1 Width: 80 Height: 25 Container@PRODUCTION_TEMPLATE: @@ -483,12 +483,12 @@ Container@SETTINGS_PANEL: Visible: false Children: Label@FUNCTION: - Y: 0-1 + Y: 0 - 1 Width: PARENT_RIGHT - 84 Height: 25 Align: Right HotkeyEntry@HOTKEY: - X: PARENT_RIGHT-WIDTH+1 + X: PARENT_RIGHT - WIDTH + 1 Width: 80 Height: 25 Container@DEVELOPER_TEMPLATE: @@ -497,12 +497,12 @@ Container@SETTINGS_PANEL: Visible: false Children: Label@FUNCTION: - Y: 0-1 + Y: 0 - 1 Width: PARENT_RIGHT - 115 Height: 25 Align: Right HotkeyEntry@HOTKEY: - X: PARENT_RIGHT-WIDTH + X: PARENT_RIGHT - WIDTH Width: 110 Height: 25 Container@ADVANCED_PANEL: diff --git a/mods/cnc/chrome/tooltips.yaml b/mods/cnc/chrome/tooltips.yaml index 01ed2b69ed..9b3cf74863 100644 --- a/mods/cnc/chrome/tooltips.yaml +++ b/mods/cnc/chrome/tooltips.yaml @@ -8,7 +8,7 @@ Background@SIMPLE_TOOLTIP: Height: 19 Label@LABEL: X: 5 - Y: 0-2 + Y: 0 - 2 Height: 23 Font: Bold diff --git a/mods/common/chrome/assetbrowser.yaml b/mods/common/chrome/assetbrowser.yaml index 7e27a8a4c2..6f942e1bee 100644 --- a/mods/common/chrome/assetbrowser.yaml +++ b/mods/common/chrome/assetbrowser.yaml @@ -1,8 +1,8 @@ Background@ASSETBROWSER_PANEL: Logic: AssetBrowserLogic SupportedFormats: .shp, .r8, .tmp, .tem, .des, .sno, .int, .vqa - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 700 Height: 500 Children: @@ -38,7 +38,7 @@ Background@ASSETBROWSER_PANEL: CollapseHiddenChildren: True Children: ScrollItem@ASSET_TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 @@ -46,7 +46,7 @@ Background@ASSETBROWSER_PANEL: Children: Label@TITLE: X: 10 - Width: PARENT_RIGHT-20 + Width: PARENT_RIGHT - 20 Height: 25 Label@FILENAME_DESC: X: 20 @@ -62,7 +62,7 @@ Background@ASSETBROWSER_PANEL: Width: 160 Height: 25 Label@PALETTE_DESC: - X: PARENT_RIGHT-WIDTH-270 + X: PARENT_RIGHT - WIDTH - 270 Y: 60 Width: 150 Height: 25 @@ -70,13 +70,13 @@ Background@ASSETBROWSER_PANEL: Align: Right Text: Palette: DropDownButton@PALETTE_SELECTOR: - X: PARENT_RIGHT-WIDTH-110 + X: PARENT_RIGHT - WIDTH - 110 Y: 60 Width: 150 Height: 25 Font: Bold DropDownButton@COLOR: - X: PARENT_RIGHT-WIDTH-20 + X: PARENT_RIGHT - WIDTH - 20 Y: 60 Width: 80 Height: 25 @@ -84,8 +84,8 @@ Background@ASSETBROWSER_PANEL: ColorBlock@COLORBLOCK: X: 5 Y: 6 - Width: PARENT_RIGHT-35 - Height: PARENT_BOTTOM-12 + Width: PARENT_RIGHT - 35 + Height: PARENT_BOTTOM - 12 Background@SPRITE_BG: X: 190 Y: 90 @@ -191,8 +191,8 @@ Background@ASSETBROWSER_PANEL: Align: Left Button@CLOSE_BUTTON: Key: escape - X: PARENT_RIGHT-180 - Y: PARENT_BOTTOM-45 + X: PARENT_RIGHT - 180 + Y: PARENT_BOTTOM - 45 Width: 160 Height: 25 Font: Bold diff --git a/mods/common/chrome/confirmation-dialogs.yaml b/mods/common/chrome/confirmation-dialogs.yaml index 3783a6b86d..5d2700b352 100644 --- a/mods/common/chrome/confirmation-dialogs.yaml +++ b/mods/common/chrome/confirmation-dialogs.yaml @@ -1,6 +1,6 @@ Background@THREEBUTTON_PROMPT: - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - 90)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - 90) / 2 Width: 600 Height: 110 Children: @@ -44,8 +44,8 @@ Background@THREEBUTTON_PROMPT: Visible: false Background@TWOBUTTON_PROMPT: - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - 90)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - 90) / 2 Width: 370 Height: 110 Children: @@ -81,8 +81,8 @@ Background@TWOBUTTON_PROMPT: Visible: false Background@TEXT_INPUT_PROMPT: - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 370 Height: 175 Children: diff --git a/mods/common/chrome/connection.yaml b/mods/common/chrome/connection.yaml index 7fa93e7cb1..693b74b7b9 100644 --- a/mods/common/chrome/connection.yaml +++ b/mods/common/chrome/connection.yaml @@ -1,7 +1,7 @@ Background@CONNECTIONFAILED_PANEL: Logic: ConnectionFailedLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 450 Height: 160 Children: @@ -60,8 +60,8 @@ Background@CONNECTIONFAILED_PANEL: Background@CONNECTING_PANEL: Logic: ConnectionLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 450 Height: 150 Children: @@ -91,8 +91,8 @@ Background@CONNECTING_PANEL: Background@CONNECTION_SWITCHMOD_PANEL: Logic: ConnectionSwitchModLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 450 Height: 191 Children: diff --git a/mods/common/chrome/credits.yaml b/mods/common/chrome/credits.yaml index b620453ef8..ba9c73f76f 100644 --- a/mods/common/chrome/credits.yaml +++ b/mods/common/chrome/credits.yaml @@ -1,7 +1,7 @@ Background@CREDITS_PANEL: Logic: CreditsLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - 400)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - 400) / 2 Width: 410 Height: 450 Children: diff --git a/mods/common/chrome/dropdowns.yaml b/mods/common/chrome/dropdowns.yaml index 73a0cbd097..c24dbe626d 100644 --- a/mods/common/chrome/dropdowns.yaml +++ b/mods/common/chrome/dropdowns.yaml @@ -3,7 +3,7 @@ ScrollPanel@LABEL_DROPDOWN_TEMPLATE: Children: ScrollItem@HEADER: BaseName: scrollheader - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 13 X: 2 Y: 0 @@ -15,7 +15,7 @@ ScrollPanel@LABEL_DROPDOWN_TEMPLATE: Height: 10 Align: Center ScrollItem@TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 @@ -23,14 +23,14 @@ ScrollPanel@LABEL_DROPDOWN_TEMPLATE: Children: Label@LABEL: X: 10 - Width: PARENT_RIGHT-20 + Width: PARENT_RIGHT - 20 Height: 25 ScrollPanel@TEAM_DROPDOWN_TEMPLATE: Width: DROPDOWN_WIDTH Children: ScrollItem@TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 @@ -46,7 +46,7 @@ ScrollPanel@SPAWN_DROPDOWN_TEMPLATE: Width: DROPDOWN_WIDTH Children: ScrollItem@TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 @@ -65,7 +65,7 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE: Children: ScrollItem@HEADER: BaseName: observer-scrollheader - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 13 X: 2 Y: 0 @@ -78,7 +78,7 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE: Align: Center ScrollItem@TEMPLATE: BaseName: observer-scrollitem - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 diff --git a/mods/common/chrome/editor.yaml b/mods/common/chrome/editor.yaml index a1d37314a0..cae75599b0 100644 --- a/mods/common/chrome/editor.yaml +++ b/mods/common/chrome/editor.yaml @@ -1,7 +1,7 @@ Background@NEW_MAP_BG: Logic: NewMapLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 300 Height: 185 Children: @@ -76,13 +76,13 @@ Background@NEW_MAP_BG: Background@SAVE_MAP_PANEL: Logic: SaveMapLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 350 Height: 300 Children: Label@LABEL_TITLE: - X: (PARENT_RIGHT - WIDTH)/2 + X: (PARENT_RIGHT - WIDTH) / 2 Y: 20 Width: 250 Height: 25 @@ -211,7 +211,7 @@ Container@EDITOR_WORLD_ROOT: Height: WINDOW_BOTTOM IgnoreMouseOver: True Background@RADAR_BG: - X: WINDOW_RIGHT-255 + X: WINDOW_RIGHT - 255 Y: 5 Width: 250 Height: 250 @@ -219,16 +219,16 @@ Container@EDITOR_WORLD_ROOT: Radar@INGAME_RADAR: X: 10 Y: 10 - Width: PARENT_RIGHT-19 - Height: PARENT_BOTTOM-19 + Width: PARENT_RIGHT - 19 + Height: PARENT_BOTTOM - 19 Container@TILE_WIDGETS: Logic: TileSelectorLogic Children: Background@TILES_BG: - X: WINDOW_RIGHT-250 + X: WINDOW_RIGHT - 250 Y: 290 Width: 240 - Height: WINDOW_BOTTOM-382 + Height: WINDOW_BOTTOM - 382 Children: DropDownButton@TILE_CATEGORY: X: 10 @@ -239,8 +239,8 @@ Container@EDITOR_WORLD_ROOT: ScrollPanel@TILETEMPLATE_LIST: X: 10 Y: 35 - Width: PARENT_RIGHT-20 - Height: PARENT_BOTTOM-45 + Width: PARENT_RIGHT - 20 + Height: PARENT_BOTTOM - 45 TopBottomSpacing: 4 ItemSpacing: 4 Children: @@ -257,16 +257,16 @@ Container@EDITOR_WORLD_ROOT: Logic: LayerSelectorLogic Children: Background@LAYERS_BG: - X: WINDOW_RIGHT-250 + X: WINDOW_RIGHT - 250 Y: 290 Width: 240 - Height: WINDOW_BOTTOM-382 + Height: WINDOW_BOTTOM - 382 Children: ScrollPanel@LAYERTEMPLATE_LIST: X: 10 Y: 10 - Width: PARENT_RIGHT-20 - Height: PARENT_BOTTOM-20 + Width: PARENT_RIGHT - 20 + Height: PARENT_BOTTOM - 20 TopBottomSpacing: 4 ItemSpacing: 4 Children: @@ -284,10 +284,10 @@ Container@EDITOR_WORLD_ROOT: Logic: ActorSelectorLogic Children: Background@ACTORS_BG: - X: WINDOW_RIGHT-250 + X: WINDOW_RIGHT - 250 Y: 290 Width: 240 - Height: WINDOW_BOTTOM-382 + Height: WINDOW_BOTTOM - 382 Children: DropDownButton@OWNERS_DROPDOWN: X: 10 @@ -298,8 +298,8 @@ Container@EDITOR_WORLD_ROOT: ScrollPanel@ACTORTEMPLATE_LIST: X: 10 Y: 35 - Width: PARENT_RIGHT-20 - Height: PARENT_BOTTOM-45 + Width: PARENT_RIGHT - 20 + Height: PARENT_BOTTOM - 45 TopBottomSpacing: 4 ItemSpacing: 4 Children: @@ -316,7 +316,7 @@ Container@EDITOR_WORLD_ROOT: Visible: true Container@MAP_EDITOR_TAB_CONTAINER: Logic: MapEditorTabsLogic - X: WINDOW_RIGHT-245 + X: WINDOW_RIGHT - 245 Y: 260 Width: 240 Height: 25 diff --git a/mods/common/chrome/ingame-chat.yaml b/mods/common/chrome/ingame-chat.yaml index 2ab1347b7c..1ccadc679c 100644 --- a/mods/common/chrome/ingame-chat.yaml +++ b/mods/common/chrome/ingame-chat.yaml @@ -6,8 +6,8 @@ Container@CHAT_PANEL: Logic: IngameChatLogic Children: Container@CHAT_OVERLAY: - Width: PARENT_RIGHT-24 - Height: PARENT_BOTTOM-25 + Width: PARENT_RIGHT - 24 + Height: PARENT_BOTTOM - 25 Visible: false Children: ChatDisplay@CHAT_DISPLAY: @@ -48,7 +48,7 @@ Container@CHAT_PANEL: Children: Container@CHAT_TEMPLATE: X: 2 - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 16 Children: Label@NAME: diff --git a/mods/common/chrome/ingame-infobriefing.yaml b/mods/common/chrome/ingame-infobriefing.yaml index cee15e9b9f..7b3566c9b3 100644 --- a/mods/common/chrome/ingame-infobriefing.yaml +++ b/mods/common/chrome/ingame-infobriefing.yaml @@ -13,8 +13,8 @@ Container@MAP_PANEL: MapPreview@MAP_PREVIEW: X: 1 Y: 1 - Width: PARENT_RIGHT-2 - Height: PARENT_BOTTOM-2 + Width: PARENT_RIGHT - 2 + Height: PARENT_BOTTOM - 2 IgnoreMouseOver: True IgnoreMouseInput: True ShowSpawnPoints: False diff --git a/mods/common/chrome/ingame-infoscripterror.yaml b/mods/common/chrome/ingame-infoscripterror.yaml index 4a6ccaf5fd..efce6b2568 100644 --- a/mods/common/chrome/ingame-infoscripterror.yaml +++ b/mods/common/chrome/ingame-infoscripterror.yaml @@ -5,7 +5,7 @@ Container@SCRIPT_ERROR_PANEL: Label@DESCA: X: 15 Y: 15 - Width: PARENT_RIGHT-30 + Width: PARENT_RIGHT - 30 Height: 20 Font: Bold Align: Center @@ -13,7 +13,7 @@ Container@SCRIPT_ERROR_PANEL: Label@DESCB: X: 15 Y: 45 - Width: PARENT_RIGHT-30 + Width: PARENT_RIGHT - 30 Height: 20 Font: Regular WordWrap: true @@ -21,7 +21,7 @@ Container@SCRIPT_ERROR_PANEL: Label@DESCC: X: 15 Y: 65 - Width: PARENT_RIGHT-30 + Width: PARENT_RIGHT - 30 Height: 20 Font: Regular Text: Please send this file to the map author so that they can fix this issue. diff --git a/mods/common/chrome/ingame-infostats.yaml b/mods/common/chrome/ingame-infostats.yaml index 8a3ce5d9c2..6b5f803885 100644 --- a/mods/common/chrome/ingame-infostats.yaml +++ b/mods/common/chrome/ingame-infostats.yaml @@ -68,19 +68,19 @@ Container@SKIRMISH_STATS: Children: Label@TEAM: X: 6 - Y: 0-2 + Y: 0 - 2 Width: 160 Height: 20 Font: Bold Label@TEAM_SCORE: X: 360 - Y: 0-2 + Y: 0 - 2 Width: 75 Height: 20 Font: Bold Align: Right Container@PLAYER_TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Children: diff --git a/mods/common/chrome/ingame-menu.yaml b/mods/common/chrome/ingame-menu.yaml index f42993f72f..153dac33e3 100644 --- a/mods/common/chrome/ingame-menu.yaml +++ b/mods/common/chrome/ingame-menu.yaml @@ -25,12 +25,12 @@ Container@INGAME_MENU: Container@PANEL_ROOT: Background@MENU_BUTTONS: X: 13 + (WINDOW_RIGHT - 522) / 4 - WIDTH / 2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 200 Height: 295 Children: Label@LABEL_TITLE: - X: (PARENT_RIGHT - WIDTH)/2 + X: (PARENT_RIGHT - WIDTH) / 2 Y: 20 Width: 200 Height: 30 @@ -38,7 +38,7 @@ Container@INGAME_MENU: Align: Center Font: Bold Button@RESUME: - X: (PARENT_RIGHT - WIDTH)/2 + X: (PARENT_RIGHT - WIDTH) / 2 Y: 60 Width: 140 Height: 30 @@ -46,42 +46,42 @@ Container@INGAME_MENU: Font: Bold Key: escape Button@SETTINGS: - X: (PARENT_RIGHT - WIDTH)/2 + X: (PARENT_RIGHT - WIDTH) / 2 Y: 100 Width: 140 Height: 30 Text: Settings Font: Bold Button@MUSIC: - X: (PARENT_RIGHT - WIDTH)/2 + X: (PARENT_RIGHT - WIDTH) / 2 Y: 140 Width: 140 Height: 30 Text: Music Font: Bold Button@SURRENDER: - X: (PARENT_RIGHT - WIDTH)/2 + X: (PARENT_RIGHT - WIDTH) / 2 Y: 180 Width: 140 Height: 30 Text: Surrender Font: Bold Button@SAVE_MAP: - X: (PARENT_RIGHT - WIDTH)/2 + X: (PARENT_RIGHT - WIDTH) / 2 Y: 180 Width: 140 Height: 30 Text: Save Map Font: Bold Button@ABORT_MISSION: - X: (PARENT_RIGHT - WIDTH)/2 + X: (PARENT_RIGHT - WIDTH) / 2 Y: 220 Width: 140 Height: 30 Text: Abort Mission Font: Bold Button@EXIT_EDITOR: - X: (PARENT_RIGHT - WIDTH)/2 + X: (PARENT_RIGHT - WIDTH) / 2 Y: 220 Width: 140 Height: 30 diff --git a/mods/common/chrome/ingame-observer.yaml b/mods/common/chrome/ingame-observer.yaml index ea88067bf6..21dfe47bbd 100644 --- a/mods/common/chrome/ingame-observer.yaml +++ b/mods/common/chrome/ingame-observer.yaml @@ -41,7 +41,7 @@ Container@OBSERVER_WIDGETS: Font: Bold Contrast: true Background@RADAR_BG: - X: WINDOW_RIGHT-255 + X: WINDOW_RIGHT - 255 Y: 5 Width: 250 Height: 250 @@ -49,11 +49,11 @@ Container@OBSERVER_WIDGETS: Radar@INGAME_RADAR: X: 10 Y: 10 - Width: PARENT_RIGHT-19 - Height: PARENT_BOTTOM-19 + Width: PARENT_RIGHT - 19 + Height: PARENT_BOTTOM - 19 WorldInteractionController: INTERACTION_CONTROLLER Background@OBSERVER_CONTROL_BG: - X: WINDOW_RIGHT-255 + X: WINDOW_RIGHT - 255 Y: 260 Width: 250 Height: 55 @@ -137,7 +137,7 @@ Container@OBSERVER_WIDGETS: Text: 100% Font: TinyBold Button@BUTTON_FAST: - X: 55 + 45*2 + X: 55 + 45 * 2 Y: 13 Width: 38 Height: 20 @@ -148,7 +148,7 @@ Container@OBSERVER_WIDGETS: Text: 200% Font: TinyBold Button@BUTTON_MAXIMUM: - X: 55 + 45*3 + X: 55 + 45 * 3 Y: 13 Width: 38 Height: 20 diff --git a/mods/common/chrome/ingame-observerstats.yaml b/mods/common/chrome/ingame-observerstats.yaml index f6ac2a56b4..c9d560cc39 100644 --- a/mods/common/chrome/ingame-observerstats.yaml +++ b/mods/common/chrome/ingame-observerstats.yaml @@ -19,7 +19,7 @@ Background@INGAME_OBSERVERSTATS_BG: Align: Center Text: Statistics DropDownButton@STATS_DROPDOWN: - X: PARENT_RIGHT-200 + X: PARENT_RIGHT - 200 Y: 15 Width: 185 Height: 25 @@ -272,15 +272,15 @@ Background@INGAME_OBSERVERSTATS_BG: ScrollPanel@PLAYER_STATS_PANEL: X: 25 Y: 70 - Width: PARENT_RIGHT-50 - Height: PARENT_BOTTOM-45-50 + Width: PARENT_RIGHT - 50 + Height: PARENT_BOTTOM - 45 - 50 TopBottomSpacing: 5 ItemSpacing: 5 Children: ScrollItem@TEAM_TEMPLATE: X: 0 Y: 0 - Width: PARENT_RIGHT-35 + Width: PARENT_RIGHT - 35 Height: 25 Children: Label@TEAM: @@ -292,14 +292,14 @@ Background@INGAME_OBSERVERSTATS_BG: ScrollItem@BASIC_PLAYER_TEMPLATE: X: 0 Y: 0 - Width: PARENT_RIGHT-35 + Width: PARENT_RIGHT - 35 Height: 25 Children: Image@FLAG: X: 20 Y: 5 Width: 35 - Height: PARENT_BOTTOM-5 + Height: PARENT_BOTTOM - 5 ImageName: random ImageCollection: flags Label@PLAYER: @@ -372,14 +372,14 @@ Background@INGAME_OBSERVERSTATS_BG: ScrollItem@ECONOMY_PLAYER_TEMPLATE: X: 0 Y: 0 - Width: PARENT_RIGHT-35 + Width: PARENT_RIGHT - 35 Height: 25 Children: Image@FLAG: X: 20 Y: 5 Width: 35 - Height: PARENT_BOTTOM-5 + Height: PARENT_BOTTOM - 5 ImageName: random ImageCollection: flags Label@PLAYER: @@ -435,14 +435,14 @@ Background@INGAME_OBSERVERSTATS_BG: ScrollItem@PRODUCTION_PLAYER_TEMPLATE: X: 0 Y: 0 - Width: PARENT_RIGHT-35 + Width: PARENT_RIGHT - 35 Height: 25 Children: Image@FLAG: X: 20 Y: 5 Width: 35 - Height: PARENT_BOTTOM-5 + Height: PARENT_BOTTOM - 5 ImageName: random ImageCollection: flags Label@PLAYER: @@ -466,14 +466,14 @@ Background@INGAME_OBSERVERSTATS_BG: ScrollItem@COMBAT_PLAYER_TEMPLATE: X: 0 Y: 0 - Width: PARENT_RIGHT-35 + Width: PARENT_RIGHT - 35 Height: 25 Children: Image@FLAG: X: 20 Y: 5 Width: 35 - Height: PARENT_BOTTOM-5 + Height: PARENT_BOTTOM - 5 ImageName: random ImageCollection: flags Label@PLAYER: @@ -526,8 +526,8 @@ Background@INGAME_OBSERVERSTATS_BG: Container@EARNED_THIS_MIN_GRAPH_TEMPLATE: X: 0 Y: 0 - Width: PARENT_RIGHT-100 - Height: PARENT_BOTTOM-50 + Width: PARENT_RIGHT - 100 + Height: PARENT_BOTTOM - 50 Children: LineGraph@EARNED_THIS_MIN_GRAPH: X: 0 diff --git a/mods/common/chrome/ingame-player.yaml b/mods/common/chrome/ingame-player.yaml index c5245b459c..a2d676ef01 100644 --- a/mods/common/chrome/ingame-player.yaml +++ b/mods/common/chrome/ingame-player.yaml @@ -21,8 +21,8 @@ Container@PLAYER_WIDGETS: Children: Image@ICON_TEMPLATE: Logic: AddFactionSuffixLogic - X: 0-2 - Y: 0-2 + X: 0 - 2 + Y: 0 - 2 Width: 62 Height: 46 IgnoreMouseOver: true @@ -228,7 +228,7 @@ Container@PLAYER_WIDGETS: IconSpriteOffset: -1, -1 Container@PALETTE_FOREGROUND: X: 40 - Y: 0-1 + Y: 0 - 1 Children: Image@ROW_TEMPLATE: Width: 238 diff --git a/mods/common/chrome/ingame.yaml b/mods/common/chrome/ingame.yaml index aabe1f17ca..6f1ef76998 100644 --- a/mods/common/chrome/ingame.yaml +++ b/mods/common/chrome/ingame.yaml @@ -11,7 +11,7 @@ Container@INGAME_ROOT: LogicTicker@DISCONNECT_WATCHER: Logic: DisconnectWatcherLogic Label@MISSION_TEXT: - X: WINDOW_RIGHT/2 - 256 + X: WINDOW_RIGHT / 2 - 256 Y: 22 Width: 512 Height: 25 @@ -29,7 +29,7 @@ Container@INGAME_ROOT: Width: WINDOW_RIGHT Height: WINDOW_BOTTOM StrategicProgress@STRATEGIC_PROGRESS: - X: WINDOW_RIGHT/2 + X: WINDOW_RIGHT / 2 Y: 40 Container@PLAYER_ROOT: Container@PERF_ROOT: diff --git a/mods/common/chrome/lobby-globalchat.yaml b/mods/common/chrome/lobby-globalchat.yaml index fabffc1fe6..a545de541a 100644 --- a/mods/common/chrome/lobby-globalchat.yaml +++ b/mods/common/chrome/lobby-globalchat.yaml @@ -14,7 +14,7 @@ Container@LOBBY_GLOBALCHAT_PANEL: Children: Label@CHANNEL_TOPIC: X: 10 - Y: 0-1 + Y: 0 - 1 Width: PARENT_RIGHT - 20 Height: PARENT_BOTTOM Font: TinyBold @@ -53,12 +53,12 @@ Container@LOBBY_GLOBALCHAT_PANEL: TextField@CHAT_TEXTFIELD: X: 205 Y: PARENT_BOTTOM - 25 - Width: 582-205 + Width: 582 - 205 Height: 25 LeftMargin: 60 Children: Label@LABEL_CHATTYPE: - Y: 0-1 + Y: 0 - 1 Width: 55 Height: 25 Align: Right @@ -69,7 +69,7 @@ Container@LOBBY_GLOBALCHAT_PANEL: Height: PARENT_BOTTOM - 30 Children: Container@NICKNAME_TEMPLATE: - Width: PARENT_RIGHT-25 + Width: PARENT_RIGHT - 25 Height: 20 Children: Image@INDICATOR: @@ -79,7 +79,7 @@ Container@LOBBY_GLOBALCHAT_PANEL: Y: 9 Label@NICK: X: 15 - Width: PARENT_RIGHT-15 + Width: PARENT_RIGHT - 15 Height: 20 Button@DISCONNECT_BUTTON: X: 596 @@ -90,7 +90,7 @@ Container@LOBBY_GLOBALCHAT_PANEL: Font: Bold Background@GLOBALCHAT_CONNECT_PANEL: Width: PARENT_RIGHT - Height: PARENT_BOTTOM-30 + Height: PARENT_BOTTOM - 30 Background: scrollpanel-bg Children: Label@GLOBAL_CHAT_LABEL: @@ -131,7 +131,7 @@ Container@LOBBY_GLOBALCHAT_PANEL: Disabled: true Children: Label@LABEL_CHATTYPE: - Y: 0-1 + Y: 0 - 1 Width: 55 Height: 25 Align: Right diff --git a/mods/common/chrome/lobby-kickdialogs.yaml b/mods/common/chrome/lobby-kickdialogs.yaml index 78c91c8078..cbb57e2c8a 100644 --- a/mods/common/chrome/lobby-kickdialogs.yaml +++ b/mods/common/chrome/lobby-kickdialogs.yaml @@ -25,20 +25,20 @@ Background@KICK_CLIENT_DIALOG: Align: Center Text: them from joining for the remainder of this game. Checkbox@PREVENT_REJOINING_CHECKBOX: - X: (PARENT_RIGHT - WIDTH)/2 + X: (PARENT_RIGHT - WIDTH) / 2 Y: 120 Width: 150 Height: 20 Text: Temporarily Ban Button@OK_BUTTON: - X: (PARENT_RIGHT - WIDTH)/2 + 75 + X: (PARENT_RIGHT - WIDTH) / 2 + 75 Y: 155 Width: 120 Height: 25 Text: Kick Font: Bold Button@CANCEL_BUTTON: - X: (PARENT_RIGHT - WIDTH)/2 - 75 + X: (PARENT_RIGHT - WIDTH) / 2 - 75 Y: 155 Width: 120 Height: 25 @@ -65,14 +65,14 @@ Background@KICK_SPECTATORS_DIALOG: Font: Regular Align: Center Button@OK_BUTTON: - X: (PARENT_RIGHT - WIDTH)/2 + 75 + X: (PARENT_RIGHT - WIDTH) / 2 + 75 Y: 155 Width: 120 Height: 25 Text: Ok Font: Bold Button@CANCEL_BUTTON: - X: (PARENT_RIGHT - WIDTH)/2 - 75 + X: (PARENT_RIGHT - WIDTH) / 2 - 75 Y: 155 Width: 120 Height: 25 @@ -123,14 +123,14 @@ Background@FORCE_START_DIALOG: Align: Center Text: map, and will be kicked from the server. Button@OK_BUTTON: - X: (PARENT_RIGHT - WIDTH)/2 + 75 + X: (PARENT_RIGHT - WIDTH) / 2 + 75 Y: 155 Width: 120 Height: 25 Text: Start Font: Bold Button@CANCEL_BUTTON: - X: (PARENT_RIGHT - WIDTH)/2 - 75 + X: (PARENT_RIGHT - WIDTH) / 2 - 75 Y: 155 Width: 120 Height: 25 diff --git a/mods/common/chrome/lobby-mappreview.yaml b/mods/common/chrome/lobby-mappreview.yaml index da0d70d3c7..d4d67fd7ff 100644 --- a/mods/common/chrome/lobby-mappreview.yaml +++ b/mods/common/chrome/lobby-mappreview.yaml @@ -15,8 +15,8 @@ Container@LOBBY_MAP_PREVIEW: MapPreview@MAP_PREVIEW: X: 1 Y: 1 - Width: PARENT_RIGHT-2 - Height: PARENT_BOTTOM-2 + Width: PARENT_RIGHT - 2 + Height: PARENT_BOTTOM - 2 TooltipContainer: TOOLTIP_CONTAINER LabelWithTooltip@MAP_TITLE: Y: 172 @@ -51,8 +51,8 @@ Container@LOBBY_MAP_PREVIEW: MapPreview@MAP_PREVIEW: X: 1 Y: 1 - Width: PARENT_RIGHT-2 - Height: PARENT_BOTTOM-2 + Width: PARENT_RIGHT - 2 + Height: PARENT_BOTTOM - 2 TooltipContainer: TOOLTIP_CONTAINER Label@MAP_TITLE: Y: 172 @@ -86,8 +86,8 @@ Container@LOBBY_MAP_PREVIEW: MapPreview@MAP_PREVIEW: X: 1 Y: 1 - Width: PARENT_RIGHT-2 - Height: PARENT_BOTTOM-2 + Width: PARENT_RIGHT - 2 + Height: PARENT_BOTTOM - 2 TooltipContainer: TOOLTIP_CONTAINER Label@MAP_TITLE: Y: 142 @@ -125,8 +125,8 @@ Container@LOBBY_MAP_PREVIEW: MapPreview@MAP_PREVIEW: X: 1 Y: 1 - Width: PARENT_RIGHT-2 - Height: PARENT_BOTTOM-2 + Width: PARENT_RIGHT - 2 + Height: PARENT_BOTTOM - 2 TooltipContainer: TOOLTIP_CONTAINER Label@MAP_TITLE: Y: 142 diff --git a/mods/common/chrome/lobby-music.yaml b/mods/common/chrome/lobby-music.yaml index e232d75ead..3b1ee9b06a 100644 --- a/mods/common/chrome/lobby-music.yaml +++ b/mods/common/chrome/lobby-music.yaml @@ -5,7 +5,7 @@ Container@LOBBY_MUSIC_BIN: Children: LogicTicker@SONG_WATCHER: Container@LABEL_CONTAINER: - Y: 0-25 + Y: 0 - 25 Width: PARENT_RIGHT Children: Label@MUSIC: @@ -21,7 +21,7 @@ Container@LOBBY_MUSIC_BIN: Text: Track Font: Bold Label@TYPE: - X: PARENT_RIGHT-63 + X: PARENT_RIGHT - 63 Height: 25 Width: 50 Text: Length @@ -116,7 +116,7 @@ Container@LOBBY_MUSIC_BIN: Font: Regular Text: Shuffle Checkbox@REPEAT: - X: PARENT_RIGHT-15-WIDTH + X: PARENT_RIGHT - 15 - WIDTH Y: 150 Width: 70 Height: 20 @@ -136,51 +136,51 @@ Container@LOBBY_MUSIC_BIN: Ticks: 5 ScrollPanel@MUSIC_LIST: X: 268 - Width: PARENT_RIGHT-268 + Width: PARENT_RIGHT - 268 Height: PARENT_BOTTOM Children: ScrollItem@MUSIC_TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Visible: false Children: Label@TITLE: X: 10 - Width: PARENT_RIGHT-50 + Width: PARENT_RIGHT - 50 Height: 25 Label@LENGTH: - X: PARENT_RIGHT-60 + X: PARENT_RIGHT - 60 Width: 50 Height: 25 Align: Right Container@NO_MUSIC_LABEL: X: 268 - Width: PARENT_RIGHT-268 + Width: PARENT_RIGHT - 268 Visible: false Children: Label@TITLE: Y: 65 - Width: PARENT_RIGHT-24 + Width: PARENT_RIGHT - 24 Height: 25 Font: Bold Align: Center Text: Music Not Installed Label@DESCA: Y: 85 - Width: PARENT_RIGHT-24 + Width: PARENT_RIGHT - 24 Height: 25 Align: Center Text: The game music can be installed Label@DESCB: Y: 105 - Width: PARENT_RIGHT-24 + Width: PARENT_RIGHT - 24 Height: 25 Align: Center Text: from the "Manage Content" menu Label@DESCC: Y: 125 - Width: PARENT_RIGHT-24 + Width: PARENT_RIGHT - 24 Height: 25 Align: Center Text: in the mod chooser. diff --git a/mods/common/chrome/lobby-options.yaml b/mods/common/chrome/lobby-options.yaml index eea655dd8a..496a4ab7c4 100644 --- a/mods/common/chrome/lobby-options.yaml +++ b/mods/common/chrome/lobby-options.yaml @@ -14,8 +14,8 @@ Background@LOBBY_OPTIONS_BIN: Container: X: 30 Y: 30 - Width: PARENT_RIGHT-60 - Height: PARENT_BOTTOM-75 + Width: PARENT_RIGHT - 60 + Height: PARENT_BOTTOM - 75 Children: Checkbox@EXPLORED_MAP_CHECKBOX: Width: 150 diff --git a/mods/common/chrome/lobby-players.yaml b/mods/common/chrome/lobby-players.yaml index 8289b60019..15848a02af 100644 --- a/mods/common/chrome/lobby-players.yaml +++ b/mods/common/chrome/lobby-players.yaml @@ -4,7 +4,7 @@ Container@LOBBY_PLAYER_BIN: Children: Container@LABEL_CONTAINER: X: 5 - Y: 0-27 + Y: 0 - 27 Width: PARENT_RIGHT Height: PARENT_BOTTOM Children: @@ -75,8 +75,8 @@ Container@LOBBY_PLAYER_BIN: ColorBlock@LATENCY_COLOR: X: 2 Y: 2 - Width: PARENT_RIGHT-4 - Height: PARENT_BOTTOM-4 + Width: PARENT_RIGHT - 4 + Height: PARENT_BOTTOM - 4 ClientTooltipRegion@CLIENT_REGION: Width: 11 Height: 25 @@ -104,8 +104,8 @@ Container@LOBBY_PLAYER_BIN: ColorBlock@COLORBLOCK: X: 5 Y: 6 - Width: PARENT_RIGHT-35 - Height: PARENT_BOTTOM-12 + Width: PARENT_RIGHT - 35 + Height: PARENT_BOTTOM - 12 DropDownButton@FACTION: X: 270 Width: 130 @@ -169,8 +169,8 @@ Container@LOBBY_PLAYER_BIN: ColorBlock@LATENCY_COLOR: X: 2 Y: 2 - Width: PARENT_RIGHT-4 - Height: PARENT_BOTTOM-4 + Width: PARENT_RIGHT - 4 + Height: PARENT_BOTTOM - 4 ClientTooltipRegion@CLIENT_REGION: Width: 11 Height: 25 @@ -178,7 +178,7 @@ Container@LOBBY_PLAYER_BIN: Template: CLIENT_TOOLTIP Label@NAME: X: 20 - Y: 0-1 + Y: 0 - 1 Width: 165 Height: 25 Text: Name @@ -238,7 +238,7 @@ Container@LOBBY_PLAYER_BIN: Width: 165 Height: 25 X: 20 - Y: 0-1 + Y: 0 - 1 Text: Name DropDownButton@SLOT_OPTIONS: X: 15 @@ -271,8 +271,8 @@ Container@LOBBY_PLAYER_BIN: ColorBlock@LATENCY_COLOR: X: 2 Y: 2 - Width: PARENT_RIGHT-4 - Height: PARENT_BOTTOM-4 + Width: PARENT_RIGHT - 4 + Height: PARENT_BOTTOM - 4 ClientTooltipRegion@CLIENT_REGION: Width: 11 Height: 25 @@ -325,8 +325,8 @@ Container@LOBBY_PLAYER_BIN: ColorBlock@LATENCY_COLOR: X: 2 Y: 2 - Width: PARENT_RIGHT-4 - Height: PARENT_BOTTOM-4 + Width: PARENT_RIGHT - 4 + Height: PARENT_BOTTOM - 4 ClientTooltipRegion@CLIENT_REGION: Width: 11 Height: 25 @@ -336,7 +336,7 @@ Container@LOBBY_PLAYER_BIN: Width: 160 Height: 25 X: 20 - Y: 0-1 + Y: 0 - 1 Text: Name Button@KICK: X: 155 @@ -384,7 +384,7 @@ ScrollPanel@FACTION_DROPDOWN_TEMPLATE: Children: ScrollItem@HEADER: BaseName: scrollheader - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 13 X: 2 Y: 0 @@ -396,7 +396,7 @@ ScrollPanel@FACTION_DROPDOWN_TEMPLATE: Height: 10 Align: Center ScrollItem@TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 diff --git a/mods/common/chrome/lobby.yaml b/mods/common/chrome/lobby.yaml index edb4b026d0..2071961c66 100644 --- a/mods/common/chrome/lobby.yaml +++ b/mods/common/chrome/lobby.yaml @@ -1,7 +1,7 @@ Background@SERVER_LOBBY: Logic: LobbyLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 808 Height: 600 Children: @@ -13,7 +13,7 @@ Background@SERVER_LOBBY: Height: 25 Font: Bold Container@MAP_PREVIEW_ROOT: - X: PARENT_RIGHT-20-WIDTH + X: PARENT_RIGHT - 20 - WIDTH Y: 67 Width: 174 Height: 250 @@ -85,7 +85,7 @@ Background@SERVER_LOBBY: Children: Container@CHAT_TEMPLATE: X: 2 - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 16 Children: Label@TIME: @@ -115,7 +115,7 @@ Background@SERVER_LOBBY: LeftMargin: 50 Children: Label@LABEL_CHATTYPE: - Y: 0-1 + Y: 0 - 1 Width: 45 Height: 25 Align: Right diff --git a/mods/common/chrome/mainmenu.yaml b/mods/common/chrome/mainmenu.yaml index db6ebe980f..bb496e53aa 100644 --- a/mods/common/chrome/mainmenu.yaml +++ b/mods/common/chrome/mainmenu.yaml @@ -26,7 +26,7 @@ Container@MAINMENU: Contrast: True Container@MENUS: X: 13 + (WINDOW_RIGHT - 522) / 4 - WIDTH / 2 - Y: WINDOW_BOTTOM/2-HEIGHT/2 + Y: WINDOW_BOTTOM / 2 - HEIGHT / 2 Width: 200 Height: 320 Children: @@ -43,42 +43,42 @@ Container@MAINMENU: Align: Center Font: Bold Button@SINGLEPLAYER_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 60 Width: 140 Height: 30 Text: Singleplayer Font: Bold Button@MULTIPLAYER_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 100 Width: 140 Height: 30 Text: Multiplayer Font: Bold Button@SETTINGS_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 140 Width: 140 Height: 30 Text: Settings Font: Bold Button@EXTRAS_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 180 Width: 140 Height: 30 Text: Extras Font: Bold Button@CONTENT_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 220 Width: 140 Height: 30 Text: Manage Content Font: Bold Button@QUIT_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 260 Width: 140 Height: 30 @@ -97,21 +97,21 @@ Container@MAINMENU: Align: Center Font: Bold Button@SKIRMISH_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 60 Width: 140 Height: 30 Text: Skirmish Font: Bold Button@MISSIONS_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 100 Width: 140 Height: 30 Text: Missions Font: Bold Button@BACK_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Key: escape Y: 260 Width: 140 @@ -131,42 +131,42 @@ Container@MAINMENU: Align: Center Font: Bold Button@REPLAYS_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 60 Width: 140 Height: 30 Text: Replays Font: Bold Button@MUSIC_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 100 Width: 140 Height: 30 Text: Music Font: Bold Button@MAP_EDITOR_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 140 Width: 140 Height: 30 Text: Map Editor Font: Bold Button@ASSETBROWSER_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 180 Width: 140 Height: 30 Text: Asset Browser Font: Bold Button@CREDITS_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 220 Width: 140 Height: 30 Text: Credits Font: Bold Button@BACK_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Key: escape Y: 260 Width: 140 @@ -186,21 +186,21 @@ Container@MAINMENU: Align: Center Font: Bold Button@NEW_MAP_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 60 Width: 140 Height: 30 Text: New Map Font: Bold Button@LOAD_MAP_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 100 Width: 140 Height: 30 Text: Load Map Font: Bold Button@BACK_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Key: escape Y: 260 Width: 140 @@ -208,8 +208,8 @@ Container@MAINMENU: Text: Back Font: Bold Background@SYSTEM_INFO_PROMPT: - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 520 Height: 260 Children: @@ -285,7 +285,7 @@ Container@MAINMENU: Width: 200 Height: 200 Background@NEWS_BG: - X: (WINDOW_RIGHT - WIDTH)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 Y: 35 Width: 430 Height: 55 diff --git a/mods/common/chrome/map-chooser.yaml b/mods/common/chrome/map-chooser.yaml index e1dee8633e..270f1c0717 100644 --- a/mods/common/chrome/map-chooser.yaml +++ b/mods/common/chrome/map-chooser.yaml @@ -1,6 +1,6 @@ Background@MAPCHOOSER_PANEL: - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Logic: MapChooserLogic Width: 808 Height: 600 @@ -53,7 +53,7 @@ Background@MAPCHOOSER_PANEL: Visible: false Children: MapPreview@PREVIEW: - X: (PARENT_RIGHT - WIDTH)/2 + X: (PARENT_RIGHT - WIDTH) / 2 Y: 3 Width: 179 Height: 179 @@ -61,25 +61,25 @@ Background@MAPCHOOSER_PANEL: IgnoreMouseInput: true Label@TITLE: X: 4 - Y: PARENT_BOTTOM-53 - Width: PARENT_RIGHT-8 + Y: PARENT_BOTTOM - 53 + Width: PARENT_RIGHT - 8 Align: Center Label@DETAILS: - Width: PARENT_RIGHT-8 + Width: PARENT_RIGHT - 8 X: 4 - Y: PARENT_BOTTOM-37 + Y: PARENT_BOTTOM - 37 Align: Center Font: Tiny Label@AUTHOR: - Width: PARENT_RIGHT-8 + Width: PARENT_RIGHT - 8 X: 4 - Y: PARENT_BOTTOM-25 + Y: PARENT_BOTTOM - 25 Align: Center Font: Tiny Label@SIZE: - Width: PARENT_RIGHT-8 + Width: PARENT_RIGHT - 8 X: 4 - Y: PARENT_BOTTOM-13 + Y: PARENT_BOTTOM - 13 Align: Center Font: Tiny Label@FILTER_DESC: diff --git a/mods/common/chrome/missionbrowser.yaml b/mods/common/chrome/missionbrowser.yaml index 13b4924fff..bc9c2ae567 100644 --- a/mods/common/chrome/missionbrowser.yaml +++ b/mods/common/chrome/missionbrowser.yaml @@ -1,7 +1,7 @@ Background@MISSIONBROWSER_PANEL: Logic: MissionBrowserLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 682 Height: 487 Children: @@ -20,7 +20,7 @@ Background@MISSIONBROWSER_PANEL: Children: ScrollItem@HEADER: BaseName: scrollheader - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 13 X: 2 Visible: false @@ -31,13 +31,13 @@ Background@MISSIONBROWSER_PANEL: Height: 10 Align: Center ScrollItem@TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Children: Label@TITLE: X: 10 - Width: PARENT_RIGHT-20 + Width: PARENT_RIGHT - 20 Height: 25 Container@MISSION_INFO: X: 300 @@ -53,8 +53,8 @@ Background@MISSIONBROWSER_PANEL: MapPreview@MISSION_PREVIEW: X: 1 Y: 1 - Width: PARENT_RIGHT-2 - Height: PARENT_BOTTOM-2 + Width: PARENT_RIGHT - 2 + Height: PARENT_BOTTOM - 2 IgnoreMouseOver: True IgnoreMouseInput: True ShowSpawnPoints: False diff --git a/mods/common/chrome/multiplayer-browser.yaml b/mods/common/chrome/multiplayer-browser.yaml index 63cb76b1de..64dca7b2cd 100644 --- a/mods/common/chrome/multiplayer-browser.yaml +++ b/mods/common/chrome/multiplayer-browser.yaml @@ -40,20 +40,20 @@ Container@MULTIPLAYER_BROWSER_PANEL: Children: ScrollItem@HEADER_TEMPLATE: X: 2 - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 20 BaseName: scrollheader Visible: false Children: Label@LABEL: - Y: 0-1 + Y: 0 - 1 Font: TinyBold Width: PARENT_RIGHT Height: 20 Align: Center ScrollItem@SERVER_TEMPLATE: X: 2 - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 Children: Label@TITLE: @@ -86,7 +86,7 @@ Container@MULTIPLAYER_BROWSER_PANEL: Align: Center Visible: false Container@SELECTED_SERVER: - X: PARENT_RIGHT-WIDTH + X: PARENT_RIGHT - WIDTH Y: 30 Width: 174 Height: 280 @@ -99,8 +99,8 @@ Container@MULTIPLAYER_BROWSER_PANEL: MapPreview@SELECTED_MAP_PREVIEW: X: 1 Y: 1 - Width: PARENT_RIGHT-2 - Height: PARENT_BOTTOM-2 + Width: PARENT_RIGHT - 2 + Height: PARENT_BOTTOM - 2 TooltipContainer: TOOLTIP_CONTAINER Label@SELECTED_MAP: Y: 172 diff --git a/mods/common/chrome/multiplayer-createserver.yaml b/mods/common/chrome/multiplayer-createserver.yaml index d73c31f6ea..ac907169ba 100644 --- a/mods/common/chrome/multiplayer-createserver.yaml +++ b/mods/common/chrome/multiplayer-createserver.yaml @@ -111,7 +111,7 @@ Container@MULTIPLAYER_CREATESERVER_PANEL: WordWrap: True Text: Your router does not seem to support UPnP. Please consult your router's manual. Container@SIDEBAR: - X: PARENT_RIGHT-WIDTH + X: PARENT_RIGHT - WIDTH Y: 30 Width: 174 Height: 280 @@ -134,7 +134,7 @@ Container@MULTIPLAYER_CREATESERVER_PANEL: Align: Center Button@MAP_BUTTON: X: PARENT_RIGHT - WIDTH - Y: 284-30 + Y: 284 - 30 Width: 174 Height: 25 Text: Choose Map diff --git a/mods/common/chrome/multiplayer-directconnect.yaml b/mods/common/chrome/multiplayer-directconnect.yaml index a692b5e4e5..5071625a0d 100644 --- a/mods/common/chrome/multiplayer-directconnect.yaml +++ b/mods/common/chrome/multiplayer-directconnect.yaml @@ -42,7 +42,7 @@ Container@MULTIPLAYER_DIRECTCONNECT_PANEL: Height: 25 MaxLength: 5 Container@SIDEBAR: - X: PARENT_RIGHT-WIDTH + X: PARENT_RIGHT - WIDTH Y: 30 Width: 174 Height: 280 diff --git a/mods/common/chrome/multiplayer-globalchat.yaml b/mods/common/chrome/multiplayer-globalchat.yaml index 4cb404482c..60f9a65dda 100644 --- a/mods/common/chrome/multiplayer-globalchat.yaml +++ b/mods/common/chrome/multiplayer-globalchat.yaml @@ -14,7 +14,7 @@ Container@GLOBALCHAT_PANEL: Children: Label@CHANNEL_TOPIC: X: 10 - Y: 0-1 + Y: 0 - 1 Width: PARENT_RIGHT - 20 Height: PARENT_BOTTOM Font: TinyBold @@ -57,19 +57,19 @@ Container@GLOBALCHAT_PANEL: LeftMargin: 60 Children: Label@LABEL_CHATTYPE: - Y: 0-1 + Y: 0 - 1 Width: 55 Height: 25 Align: Right Text: Global: ScrollPanel@NICKNAME_PANEL: - X: PARENT_RIGHT-WIDTH + X: PARENT_RIGHT - WIDTH Width: 174 Height: PARENT_BOTTOM - 30 Children: Container@NICKNAME_TEMPLATE: Height: 20 - Width: PARENT_RIGHT-25 + Width: PARENT_RIGHT - 25 Children: Image@INDICATOR: ImageCollection: lobby-bits @@ -78,10 +78,10 @@ Container@GLOBALCHAT_PANEL: Y: 9 Label@NICK: X: 15 - Width: PARENT_RIGHT-15 + Width: PARENT_RIGHT - 15 Height: 20 Button@DISCONNECT_BUTTON: - X: PARENT_RIGHT-WIDTH + X: PARENT_RIGHT - WIDTH Y: PARENT_BOTTOM - 25 Width: 174 Height: 25 diff --git a/mods/common/chrome/multiplayer.yaml b/mods/common/chrome/multiplayer.yaml index d41c0d86ec..6df32ced33 100644 --- a/mods/common/chrome/multiplayer.yaml +++ b/mods/common/chrome/multiplayer.yaml @@ -1,7 +1,7 @@ Background@MULTIPLAYER_PANEL: Logic: MultiplayerLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 808 Height: 600 Children: @@ -74,7 +74,7 @@ ScrollPanel@MULTIPLAYER_FILTER_PANEL: Checkbox@WAITING_FOR_PLAYERS: X: 5 Y: 5 - Width: PARENT_RIGHT-29 + Width: PARENT_RIGHT - 29 Height: 20 Text: Waiting TextColor: 32CD32 @@ -82,14 +82,14 @@ ScrollPanel@MULTIPLAYER_FILTER_PANEL: Checkbox@EMPTY: X: 5 Y: 30 - Width: PARENT_RIGHT-29 + Width: PARENT_RIGHT - 29 Height: 20 Text: Empty Font: Regular Checkbox@PASSWORD_PROTECTED: X: 5 Y: 55 - Width: PARENT_RIGHT-29 + Width: PARENT_RIGHT - 29 Height: 20 Text: Protected TextColor: FF0000 @@ -97,7 +97,7 @@ ScrollPanel@MULTIPLAYER_FILTER_PANEL: Checkbox@ALREADY_STARTED: X: 5 Y: 80 - Width: PARENT_RIGHT-29 + Width: PARENT_RIGHT - 29 Height: 20 Text: Started TextColor: FFA500 @@ -105,7 +105,7 @@ ScrollPanel@MULTIPLAYER_FILTER_PANEL: Checkbox@INCOMPATIBLE_VERSION: X: 5 Y: 105 - Width: PARENT_RIGHT-29 + Width: PARENT_RIGHT - 29 Height: 20 Text: Incompatible TextColor: BEBEBE diff --git a/mods/common/chrome/musicplayer.yaml b/mods/common/chrome/musicplayer.yaml index fc6290bf01..88034e74cb 100644 --- a/mods/common/chrome/musicplayer.yaml +++ b/mods/common/chrome/musicplayer.yaml @@ -1,7 +1,7 @@ Background@MUSIC_PANEL: Logic: MusicPlayerLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - 400)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - 400) / 2 Width: 360 Height: 450 Children: @@ -13,7 +13,7 @@ Background@MUSIC_PANEL: Height: 275 Children: ScrollItem@MUSIC_TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 @@ -21,11 +21,11 @@ Background@MUSIC_PANEL: Children: Label@TITLE: X: 10 - Width: PARENT_RIGHT-50 + Width: PARENT_RIGHT - 50 Height: 25 Label@LENGTH: Width: 50 - X: PARENT_RIGHT-60 + X: PARENT_RIGHT - 60 Align: Right Height: 25 Container@LABEL_CONTAINER: @@ -40,7 +40,7 @@ Background@MUSIC_PANEL: Align: Center Font: Bold Label@TYPE: - X: PARENT_RIGHT-85 + X: PARENT_RIGHT - 85 Height: 25 Width: 50 Text: Length @@ -48,7 +48,7 @@ Background@MUSIC_PANEL: Font: Bold Container@BUTTONS: X: 15 - Y: PARENT_BOTTOM-HEIGHT-85 + Y: PARENT_BOTTOM - HEIGHT - 85 Width: 170 Children: Button@BUTTON_PREV: @@ -123,7 +123,7 @@ Background@MUSIC_PANEL: Height: 20 Ticks: 5 Label@TIME_LABEL: - X: (PARENT_RIGHT-WIDTH)/2 + X: (PARENT_RIGHT - WIDTH) / 2 Y: 330 Width: 140 Height: 25 @@ -136,7 +136,7 @@ Background@MUSIC_PANEL: Height: 20 Text: Shuffle Checkbox@REPEAT: - X: PARENT_RIGHT-15-WIDTH + X: PARENT_RIGHT - 15 - WIDTH Y: 335 Width: 70 Height: 20 @@ -149,26 +149,26 @@ Background@MUSIC_PANEL: Visible: false Children: Label@TITLE: - Width: PARENT_RIGHT-24 + Width: PARENT_RIGHT - 24 Height: 25 Font: Bold Align: Center Text: Music Not Installed Label@DESCA: Y: 20 - Width: PARENT_RIGHT-24 + Width: PARENT_RIGHT - 24 Height: 25 Align: Center Text: The game music can be installed Label@DESCB: Y: 40 - Width: PARENT_RIGHT-24 + Width: PARENT_RIGHT - 24 Height: 25 Align: Center Text: from the "Manage Content" menu Label@DESCC: Y: 60 - Width: PARENT_RIGHT-24 + Width: PARENT_RIGHT - 24 Height: 25 Align: Center Text: in the mod chooser. diff --git a/mods/common/chrome/replaybrowser.yaml b/mods/common/chrome/replaybrowser.yaml index 036fdbba7e..3f51046c91 100644 --- a/mods/common/chrome/replaybrowser.yaml +++ b/mods/common/chrome/replaybrowser.yaml @@ -1,7 +1,7 @@ Background@REPLAYBROWSER_PANEL: Logic: ReplayBrowserLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 780 Height: 535 Children: @@ -172,14 +172,14 @@ Background@REPLAYBROWSER_PANEL: CollapseHiddenChildren: True Children: ScrollItem@REPLAY_TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Visible: false Children: Label@TITLE: X: 10 - Width: PARENT_RIGHT-20 + Width: PARENT_RIGHT - 20 Height: 25 Container@MAP_BG_CONTAINER: X: PARENT_RIGHT - WIDTH - 20 @@ -207,9 +207,9 @@ Background@REPLAYBROWSER_PANEL: TooltipContainer: TOOLTIP_CONTAINER Container@REPLAY_INFO: X: PARENT_RIGHT - WIDTH - 20 - Y: 20 + 30+194 + 10 + Y: 20 + 30 + 194 + 10 Width: 194 - Height: PARENT_BOTTOM - 20 - 30-194 - 10 - 55 + Height: PARENT_BOTTOM - 20 - 30 - 194 - 10 - 55 Children: Label@MAP_TITLE: Y: 0 @@ -237,7 +237,7 @@ Background@REPLAYBROWSER_PANEL: Children: ScrollItem@HEADER: BaseName: scrollheader - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 13 X: 2 Y: 0 @@ -249,7 +249,7 @@ Background@REPLAYBROWSER_PANEL: Height: 10 Align: Center ScrollItem@TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 @@ -262,7 +262,7 @@ Background@REPLAYBROWSER_PANEL: Height: 16 Label@LABEL: X: 40 - Width: PARENT_RIGHT-50 + Width: PARENT_RIGHT - 50 Height: 25 Shadow: True Label@NOFLAG_LABEL: diff --git a/mods/common/chrome/settings.yaml b/mods/common/chrome/settings.yaml index d2fddd9e3f..b7647b2cc3 100644 --- a/mods/common/chrome/settings.yaml +++ b/mods/common/chrome/settings.yaml @@ -1,7 +1,7 @@ Background@SETTINGS_PANEL: Logic: SettingsLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM- HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 600 Height: 450 Children: @@ -83,7 +83,7 @@ Background@SETTINGS_PANEL: Label@At: Text: @ Font: Bold - Y: 0-1 + Y: 0 - 1 Height: 25 Width: 25 Align: Center @@ -96,7 +96,7 @@ Background@SETTINGS_PANEL: Text: x Font: Bold X: 70 - Y: 0-1 + Y: 0 - 1 Height: 25 Width: 15 Align: Center @@ -187,8 +187,8 @@ Background@SETTINGS_PANEL: ColorBlock@COLORBLOCK: X: 5 Y: 6 - Width: PARENT_RIGHT-35 - Height: PARENT_BOTTOM-12 + Width: PARENT_RIGHT - 35 + Height: PARENT_BOTTOM - 12 Label@STATUS_BARS: X: 310 Y: 275 @@ -460,12 +460,12 @@ Background@SETTINGS_PANEL: Visible: false Children: Label@FUNCTION: - Y: 0-1 + Y: 0 - 1 Width: PARENT_RIGHT - 85 Height: 25 Align: Right HotkeyEntry@HOTKEY: - X: PARENT_RIGHT-WIDTH + X: PARENT_RIGHT - WIDTH Width: 80 Height: 25 Container@UNIT_TEMPLATE: @@ -474,12 +474,12 @@ Background@SETTINGS_PANEL: Visible: false Children: Label@FUNCTION: - Y: 0-1 + Y: 0 - 1 Width: PARENT_RIGHT - 84 Height: 25 Align: Right HotkeyEntry@HOTKEY: - X: PARENT_RIGHT-WIDTH+1 + X: PARENT_RIGHT - WIDTH + 1 Width: 80 Height: 25 Container@PRODUCTION_TEMPLATE: @@ -488,12 +488,12 @@ Background@SETTINGS_PANEL: Visible: false Children: Label@FUNCTION: - Y: 0-1 + Y: 0 - 1 Width: PARENT_RIGHT - 84 Height: 25 Align: Right HotkeyEntry@HOTKEY: - X: PARENT_RIGHT-WIDTH+1 + X: PARENT_RIGHT - WIDTH + 1 Width: 80 Height: 25 Container@DEVELOPER_TEMPLATE: @@ -502,12 +502,12 @@ Background@SETTINGS_PANEL: Visible: false Children: Label@FUNCTION: - Y: 0-1 + Y: 0 - 1 Width: PARENT_RIGHT - 115 Height: 25 Align: Right HotkeyEntry@HOTKEY: - X: PARENT_RIGHT-WIDTH + X: PARENT_RIGHT - WIDTH Width: 110 Height: 25 Container@ADVANCED_PANEL: diff --git a/mods/common/chrome/tooltips.yaml b/mods/common/chrome/tooltips.yaml index f6c57cf6b5..6bb447a86b 100644 --- a/mods/common/chrome/tooltips.yaml +++ b/mods/common/chrome/tooltips.yaml @@ -8,7 +8,7 @@ Background@SIMPLE_TOOLTIP: Height: 19 Label@LABEL: X: 7 - Y: 0-1 + Y: 0 - 1 Height: 23 Font: Bold diff --git a/mods/d2k/chrome/dropdowns.yaml b/mods/d2k/chrome/dropdowns.yaml index 987928d930..10a9bf4fcd 100644 --- a/mods/d2k/chrome/dropdowns.yaml +++ b/mods/d2k/chrome/dropdowns.yaml @@ -3,7 +3,7 @@ ScrollPanel@LABEL_DROPDOWN_TEMPLATE: Children: ScrollItem@HEADER: BaseName: scrollheader - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 13 X: 2 Y: 0 @@ -15,7 +15,7 @@ ScrollPanel@LABEL_DROPDOWN_TEMPLATE: Height: 10 Align: Center ScrollItem@TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 @@ -23,14 +23,14 @@ ScrollPanel@LABEL_DROPDOWN_TEMPLATE: Children: Label@LABEL: X: 10 - Width: PARENT_RIGHT-20 + Width: PARENT_RIGHT - 20 Height: 25 ScrollPanel@TEAM_DROPDOWN_TEMPLATE: Width: DROPDOWN_WIDTH Children: ScrollItem@TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 @@ -46,7 +46,7 @@ ScrollPanel@SPAWN_DROPDOWN_TEMPLATE: Width: DROPDOWN_WIDTH Children: ScrollItem@TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 @@ -63,7 +63,7 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE: Children: ScrollItem@HEADER: BaseName: scrollheader - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 13 X: 2 Y: 0 @@ -75,7 +75,7 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE: Height: 10 Align: Center ScrollItem@TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 diff --git a/mods/d2k/chrome/ingame-infostats.yaml b/mods/d2k/chrome/ingame-infostats.yaml index 8a3ce5d9c2..6b5f803885 100644 --- a/mods/d2k/chrome/ingame-infostats.yaml +++ b/mods/d2k/chrome/ingame-infostats.yaml @@ -68,19 +68,19 @@ Container@SKIRMISH_STATS: Children: Label@TEAM: X: 6 - Y: 0-2 + Y: 0 - 2 Width: 160 Height: 20 Font: Bold Label@TEAM_SCORE: X: 360 - Y: 0-2 + Y: 0 - 2 Width: 75 Height: 20 Font: Bold Align: Right Container@PLAYER_TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Children: diff --git a/mods/d2k/chrome/ingame-menu.yaml b/mods/d2k/chrome/ingame-menu.yaml index 24837fbe63..46b1961053 100644 --- a/mods/d2k/chrome/ingame-menu.yaml +++ b/mods/d2k/chrome/ingame-menu.yaml @@ -12,12 +12,12 @@ Container@INGAME_MENU: Container@PANEL_ROOT: Background@MENU_BUTTONS: X: 13 + (WINDOW_RIGHT - 522) / 4 - WIDTH / 2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 200 Height: 295 Children: Label@LABEL_TITLE: - X: (PARENT_RIGHT - WIDTH)/2 + X: (PARENT_RIGHT - WIDTH) / 2 Y: 20 Width: 200 Height: 30 @@ -25,7 +25,7 @@ Container@INGAME_MENU: Align: Center Font: Bold Button@RESUME: - X: (PARENT_RIGHT - WIDTH)/2 + X: (PARENT_RIGHT - WIDTH) / 2 Y: 60 Width: 140 Height: 30 @@ -33,42 +33,42 @@ Container@INGAME_MENU: Font: Bold Key: escape Button@SETTINGS: - X: (PARENT_RIGHT - WIDTH)/2 + X: (PARENT_RIGHT - WIDTH) / 2 Y: 100 Width: 140 Height: 30 Text: Settings Font: Bold Button@MUSIC: - X: (PARENT_RIGHT - WIDTH)/2 + X: (PARENT_RIGHT - WIDTH) / 2 Y: 140 Width: 140 Height: 30 Text: Music Font: Bold Button@SURRENDER: - X: (PARENT_RIGHT - WIDTH)/2 + X: (PARENT_RIGHT - WIDTH) / 2 Y: 180 Width: 140 Height: 30 Text: Surrender Font: Bold Button@SAVE_MAP: - X: (PARENT_RIGHT - WIDTH)/2 + X: (PARENT_RIGHT - WIDTH) / 2 Y: 180 Width: 140 Height: 30 Text: Save Map Font: Bold Button@ABORT_MISSION: - X: (PARENT_RIGHT - WIDTH)/2 + X: (PARENT_RIGHT - WIDTH) / 2 Y: 220 Width: 140 Height: 30 Text: Abort Mission Font: Bold Button@EXIT_EDITOR: - X: (PARENT_RIGHT - WIDTH)/2 + X: (PARENT_RIGHT - WIDTH) / 2 Y: 220 Width: 140 Height: 30 diff --git a/mods/d2k/chrome/ingame-player.yaml b/mods/d2k/chrome/ingame-player.yaml index d81993e30f..bd2b045f30 100644 --- a/mods/d2k/chrome/ingame-player.yaml +++ b/mods/d2k/chrome/ingame-player.yaml @@ -20,8 +20,8 @@ Container@PLAYER_WIDGETS: Container@PALETTE_FOREGROUND: Children: Image@ICON_TEMPLATE: - X: 0-2 - Y: 0-2 + X: 0 - 2 + Y: 0 - 2 Width: 60 Height: 48 IgnoreMouseOver: true diff --git a/mods/d2k/chrome/lobby-options.yaml b/mods/d2k/chrome/lobby-options.yaml index e5659c63b6..b2c37fda62 100644 --- a/mods/d2k/chrome/lobby-options.yaml +++ b/mods/d2k/chrome/lobby-options.yaml @@ -14,8 +14,8 @@ Background@LOBBY_OPTIONS_BIN: Container: X: 30 Y: 30 - Width: PARENT_RIGHT-60 - Height: PARENT_BOTTOM-75 + Width: PARENT_RIGHT - 60 + Height: PARENT_BOTTOM - 75 Children: Checkbox@EXPLORED_MAP_CHECKBOX: Width: 150 diff --git a/mods/d2k/chrome/lobby-players.yaml b/mods/d2k/chrome/lobby-players.yaml index 6edfdf4772..8172602541 100644 --- a/mods/d2k/chrome/lobby-players.yaml +++ b/mods/d2k/chrome/lobby-players.yaml @@ -4,7 +4,7 @@ Container@LOBBY_PLAYER_BIN: Children: Container@LABEL_CONTAINER: X: 5 - Y: 0-27 + Y: 0 - 27 Width: PARENT_RIGHT Height: PARENT_BOTTOM Children: @@ -75,8 +75,8 @@ Container@LOBBY_PLAYER_BIN: ColorBlock@LATENCY_COLOR: X: 2 Y: 2 - Width: PARENT_RIGHT-4 - Height: PARENT_BOTTOM-4 + Width: PARENT_RIGHT - 4 + Height: PARENT_BOTTOM - 4 ClientTooltipRegion@CLIENT_REGION: Width: 11 Height: 25 @@ -104,8 +104,8 @@ Container@LOBBY_PLAYER_BIN: ColorBlock@COLORBLOCK: X: 5 Y: 6 - Width: PARENT_RIGHT-35 - Height: PARENT_BOTTOM-12 + Width: PARENT_RIGHT - 35 + Height: PARENT_BOTTOM - 12 DropDownButton@FACTION: X: 270 Width: 130 @@ -169,8 +169,8 @@ Container@LOBBY_PLAYER_BIN: ColorBlock@LATENCY_COLOR: X: 2 Y: 2 - Width: PARENT_RIGHT-4 - Height: PARENT_BOTTOM-4 + Width: PARENT_RIGHT - 4 + Height: PARENT_BOTTOM - 4 ClientTooltipRegion@CLIENT_REGION: Width: 11 Height: 25 @@ -178,7 +178,7 @@ Container@LOBBY_PLAYER_BIN: Template: CLIENT_TOOLTIP Label@NAME: X: 20 - Y: 0-1 + Y: 0 - 1 Width: 165 Height: 25 Text: Name @@ -236,7 +236,7 @@ Container@LOBBY_PLAYER_BIN: Children: Label@NAME: X: 20 - Y: 0-1 + Y: 0 - 1 Width: 165 Height: 25 Text: Name @@ -271,8 +271,8 @@ Container@LOBBY_PLAYER_BIN: ColorBlock@LATENCY_COLOR: X: 2 Y: 2 - Width: PARENT_RIGHT-4 - Height: PARENT_BOTTOM-4 + Width: PARENT_RIGHT - 4 + Height: PARENT_BOTTOM - 4 ClientTooltipRegion@CLIENT_REGION: Width: 11 Height: 25 @@ -325,8 +325,8 @@ Container@LOBBY_PLAYER_BIN: ColorBlock@LATENCY_COLOR: X: 2 Y: 2 - Width: PARENT_RIGHT-4 - Height: PARENT_BOTTOM-4 + Width: PARENT_RIGHT - 4 + Height: PARENT_BOTTOM - 4 ClientTooltipRegion@CLIENT_REGION: Width: 11 Height: 25 @@ -334,7 +334,7 @@ Container@LOBBY_PLAYER_BIN: Template: CLIENT_TOOLTIP Label@NAME: X: 20 - Y: 0-1 + Y: 0 - 1 Width: 160 Height: 25 Text: Name @@ -384,7 +384,7 @@ ScrollPanel@FACTION_DROPDOWN_TEMPLATE: Children: ScrollItem@HEADER: BaseName: scrollheader - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 13 X: 2 Y: 0 @@ -396,7 +396,7 @@ ScrollPanel@FACTION_DROPDOWN_TEMPLATE: Height: 10 Align: Center ScrollItem@TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 diff --git a/mods/d2k/chrome/mainmenu.yaml b/mods/d2k/chrome/mainmenu.yaml index eafb423d12..f1ff3c6bc8 100644 --- a/mods/d2k/chrome/mainmenu.yaml +++ b/mods/d2k/chrome/mainmenu.yaml @@ -13,7 +13,7 @@ Container@MAINMENU: Contrast: True Container@MENUS: X: 13 + (WINDOW_RIGHT - 522) / 4 - WIDTH / 2 - Y: WINDOW_BOTTOM/2-HEIGHT/2 + Y: WINDOW_BOTTOM / 2 - HEIGHT / 2 Width: 200 Height: 320 Children: @@ -30,42 +30,42 @@ Container@MAINMENU: Align: Center Font: Bold Button@SINGLEPLAYER_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 60 Width: 140 Height: 30 Text: Singleplayer Font: Bold Button@MULTIPLAYER_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 100 Width: 140 Height: 30 Text: Multiplayer Font: Bold Button@SETTINGS_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 140 Width: 140 Height: 30 Text: Settings Font: Bold Button@EXTRAS_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 180 Width: 140 Height: 30 Text: Extras Font: Bold Button@CONTENT_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 220 Width: 140 Height: 30 Text: Manage Content Font: Bold Button@QUIT_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 260 Width: 140 Height: 30 @@ -84,21 +84,21 @@ Container@MAINMENU: Align: Center Font: Bold Button@SKIRMISH_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 60 Width: 140 Height: 30 Text: Skirmish Font: Bold Button@MISSIONS_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 100 Width: 140 Height: 30 Text: Missions Font: Bold Button@BACK_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Key: escape Y: 260 Width: 140 @@ -118,42 +118,42 @@ Container@MAINMENU: Align: Center Font: Bold Button@REPLAYS_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 60 Width: 140 Height: 30 Text: Replays Font: Bold Button@MUSIC_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 100 Width: 140 Height: 30 Text: Music Font: Bold Button@MAP_EDITOR_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 140 Width: 140 Height: 30 Text: Map Editor Font: Bold Button@ASSETBROWSER_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 180 Width: 140 Height: 30 Text: Asset Browser Font: Bold Button@CREDITS_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 220 Width: 140 Height: 30 Text: Credits Font: Bold Button@BACK_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Key: escape Y: 260 Width: 140 @@ -173,21 +173,21 @@ Container@MAINMENU: Align: Center Font: Bold Button@NEW_MAP_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 60 Width: 140 Height: 30 Text: New Map Font: Bold Button@LOAD_MAP_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Y: 100 Width: 140 Height: 30 Text: Load Map Font: Bold Button@BACK_BUTTON: - X: PARENT_RIGHT/2-WIDTH/2 + X: PARENT_RIGHT / 2 - WIDTH / 2 Key: escape Y: 260 Width: 140 @@ -195,8 +195,8 @@ Container@MAINMENU: Text: Back Font: Bold Background@SYSTEM_INFO_PROMPT: - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 520 Height: 260 Children: @@ -250,7 +250,7 @@ Container@MAINMENU: Font: Bold Key: return Background@NEWS_BG: - X: (WINDOW_RIGHT - WIDTH)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 Y: 35 Width: 430 Height: 55 diff --git a/mods/d2k/chrome/missionbrowser.yaml b/mods/d2k/chrome/missionbrowser.yaml index 1e53abb140..279ced23e5 100644 --- a/mods/d2k/chrome/missionbrowser.yaml +++ b/mods/d2k/chrome/missionbrowser.yaml @@ -1,7 +1,7 @@ Background@MISSIONBROWSER_PANEL: Logic: MissionBrowserLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 880 Height: 591 Children: @@ -20,7 +20,7 @@ Background@MISSIONBROWSER_PANEL: Children: ScrollItem@HEADER: BaseName: scrollheader - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 13 X: 2 Visible: false @@ -31,13 +31,13 @@ Background@MISSIONBROWSER_PANEL: Height: 10 Align: Center ScrollItem@TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Children: Label@TITLE: X: 10 - Width: PARENT_RIGHT-20 + Width: PARENT_RIGHT - 20 Height: 25 Label@DIFFICULTY_DESC: X: 210 - WIDTH - 125 @@ -79,8 +79,8 @@ Background@MISSIONBROWSER_PANEL: MapPreview@MISSION_PREVIEW: X: 1 Y: 1 - Width: PARENT_RIGHT-2 - Height: PARENT_BOTTOM-2 + Width: PARENT_RIGHT - 2 + Height: PARENT_BOTTOM - 2 IgnoreMouseOver: True IgnoreMouseInput: True ShowSpawnPoints: False diff --git a/mods/d2k/chrome/tooltips.yaml b/mods/d2k/chrome/tooltips.yaml index 08b52b61b6..6e2f8cbf5b 100644 --- a/mods/d2k/chrome/tooltips.yaml +++ b/mods/d2k/chrome/tooltips.yaml @@ -8,7 +8,7 @@ Background@SIMPLE_TOOLTIP: Height: 19 Label@LABEL: X: 5 - Y: 0-2 + Y: 0 - 2 Height: 23 Font: Bold diff --git a/mods/modcontent/content.yaml b/mods/modcontent/content.yaml index dfe0da4a39..5646c9e6e4 100644 --- a/mods/modcontent/content.yaml +++ b/mods/modcontent/content.yaml @@ -44,7 +44,7 @@ Background@CONTENT_PANEL: Height: 23 Label@REQUIRED: X: 185 - Y: 0-2 + Y: 0 - 2 Width: 90 Height: 23 Align: Center @@ -69,7 +69,7 @@ Background@CONTENT_PANEL: Text: Download Label@INSTALLED: X: 304 - Y: 0-2 + Y: 0 - 2 Width: 100 Height: 23 Align: Center @@ -78,7 +78,7 @@ Background@CONTENT_PANEL: Text: Installed Label@REQUIRES_DISC: X: 304 - Y: 0-2 + Y: 0 - 2 Width: 100 Height: 23 Align: Center @@ -182,8 +182,8 @@ Container@PACKAGE_DOWNLOAD_PANEL: Background@DISC_INSTALL_PANEL: Logic: InstallFromDiscLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 500 Height: 177 Background: panel-bg @@ -290,8 +290,8 @@ Background@DISC_INSTALL_PANEL: Background@CONTENT_PROMPT_PANEL: Logic: ModContentPromptLogic - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 500 Height: 140 Background: panel-bg diff --git a/mods/ra/chrome/ingame-observer.yaml b/mods/ra/chrome/ingame-observer.yaml index 21191e2e96..73783d0daa 100644 --- a/mods/ra/chrome/ingame-observer.yaml +++ b/mods/ra/chrome/ingame-observer.yaml @@ -22,7 +22,7 @@ Container@OBSERVER_WIDGETS: Background: sidebar-button-observer Children: LabelWithTooltip@GAME_TIMER: - Y: 0-1 + Y: 0 - 1 Width: PARENT_RIGHT Height: PARENT_BOTTOM Align: Center diff --git a/mods/ts/chrome/dropdowns.yaml b/mods/ts/chrome/dropdowns.yaml index 55fbca7cbc..b97b693e2b 100644 --- a/mods/ts/chrome/dropdowns.yaml +++ b/mods/ts/chrome/dropdowns.yaml @@ -3,7 +3,7 @@ ScrollPanel@LABEL_DROPDOWN_TEMPLATE: Children: ScrollItem@HEADER: BaseName: scrollheader - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 13 X: 2 Y: 0 @@ -15,7 +15,7 @@ ScrollPanel@LABEL_DROPDOWN_TEMPLATE: Height: 10 Align: Center ScrollItem@TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 @@ -23,14 +23,14 @@ ScrollPanel@LABEL_DROPDOWN_TEMPLATE: Children: Label@LABEL: X: 10 - Width: PARENT_RIGHT-20 + Width: PARENT_RIGHT - 20 Height: 25 ScrollPanel@TEAM_DROPDOWN_TEMPLATE: Width: DROPDOWN_WIDTH Children: ScrollItem@TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 @@ -46,7 +46,7 @@ ScrollPanel@SPAWN_DROPDOWN_TEMPLATE: Width: DROPDOWN_WIDTH Children: ScrollItem@TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 @@ -63,7 +63,7 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE: Children: ScrollItem@HEADER: BaseName: scrollheader - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 13 X: 2 Y: 0 @@ -75,7 +75,7 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE: Height: 10 Align: Center ScrollItem@TEMPLATE: - Width: PARENT_RIGHT-27 + Width: PARENT_RIGHT - 27 Height: 25 X: 2 Y: 0 diff --git a/mods/ts/chrome/ingame-observer.yaml b/mods/ts/chrome/ingame-observer.yaml index 4d910a4287..4a61bb4763 100644 --- a/mods/ts/chrome/ingame-observer.yaml +++ b/mods/ts/chrome/ingame-observer.yaml @@ -41,7 +41,7 @@ Container@OBSERVER_WIDGETS: Font: Bold Contrast: true Background@RADAR_BG: - X: WINDOW_RIGHT-255 + X: WINDOW_RIGHT - 255 Y: 5 Width: 250 Height: 250 @@ -49,11 +49,11 @@ Container@OBSERVER_WIDGETS: Radar@INGAME_RADAR: X: 10 Y: 10 - Width: PARENT_RIGHT-19 - Height: PARENT_BOTTOM-19 + Width: PARENT_RIGHT - 19 + Height: PARENT_BOTTOM - 19 WorldInteractionController: INTERACTION_CONTROLLER Background@OBSERVER_CONTROL_BG: - X: WINDOW_RIGHT-255 + X: WINDOW_RIGHT - 255 Y: 260 Width: 250 Height: 55 @@ -137,7 +137,7 @@ Container@OBSERVER_WIDGETS: Text: 100% Font: TinyBold Button@BUTTON_FAST: - X: 55 + 45*2 + X: 55 + 45 * 2 Y: 13 Width: 38 Height: 20 @@ -148,7 +148,7 @@ Container@OBSERVER_WIDGETS: Text: 200% Font: TinyBold Button@BUTTON_MAXIMUM: - X: 55 + 45*3 + X: 55 + 45 * 3 Y: 13 Width: 38 Height: 20 diff --git a/mods/ts/chrome/ingame-observerstats.yaml b/mods/ts/chrome/ingame-observerstats.yaml index d14e78af34..083c5fb567 100644 --- a/mods/ts/chrome/ingame-observerstats.yaml +++ b/mods/ts/chrome/ingame-observerstats.yaml @@ -19,7 +19,7 @@ Background@INGAME_OBSERVERSTATS_BG: Align: Center Text: Statistics DropDownButton@STATS_DROPDOWN: - X: PARENT_RIGHT-200 + X: PARENT_RIGHT - 200 Y: 15 Width: 185 Height: 25 @@ -272,15 +272,15 @@ Background@INGAME_OBSERVERSTATS_BG: ScrollPanel@PLAYER_STATS_PANEL: X: 25 Y: 70 - Width: PARENT_RIGHT-50 - Height: PARENT_BOTTOM-45-50 + Width: PARENT_RIGHT - 50 + Height: PARENT_BOTTOM - 45 - 50 TopBottomSpacing: 5 ItemSpacing: 5 Children: ScrollItem@TEAM_TEMPLATE: X: 0 Y: 0 - Width: PARENT_RIGHT-35 + Width: PARENT_RIGHT - 35 Height: 25 Children: Label@TEAM: @@ -292,14 +292,14 @@ Background@INGAME_OBSERVERSTATS_BG: ScrollItem@BASIC_PLAYER_TEMPLATE: X: 0 Y: 0 - Width: PARENT_RIGHT-35 + Width: PARENT_RIGHT - 35 Height: 25 Children: Image@FLAG: X: 20 Y: 5 Width: 35 - Height: PARENT_BOTTOM-5 + Height: PARENT_BOTTOM - 5 ImageName: random ImageCollection: flags Label@PLAYER: @@ -372,14 +372,14 @@ Background@INGAME_OBSERVERSTATS_BG: ScrollItem@ECONOMY_PLAYER_TEMPLATE: X: 0 Y: 0 - Width: PARENT_RIGHT-35 + Width: PARENT_RIGHT - 35 Height: 25 Children: Image@FLAG: X: 20 Y: 5 Width: 35 - Height: PARENT_BOTTOM-5 + Height: PARENT_BOTTOM - 5 ImageName: random ImageCollection: flags Label@PLAYER: @@ -435,14 +435,14 @@ Background@INGAME_OBSERVERSTATS_BG: ScrollItem@PRODUCTION_PLAYER_TEMPLATE: X: 0 Y: 0 - Width: PARENT_RIGHT-35 + Width: PARENT_RIGHT - 35 Height: 25 Children: Image@FLAG: X: 20 Y: 5 Width: 35 - Height: PARENT_BOTTOM-5 + Height: PARENT_BOTTOM - 5 ImageName: random ImageCollection: flags Label@PLAYER: @@ -468,14 +468,14 @@ Background@INGAME_OBSERVERSTATS_BG: ScrollItem@COMBAT_PLAYER_TEMPLATE: X: 0 Y: 0 - Width: PARENT_RIGHT-35 + Width: PARENT_RIGHT - 35 Height: 25 Children: Image@FLAG: X: 20 Y: 5 Width: 35 - Height: PARENT_BOTTOM-5 + Height: PARENT_BOTTOM - 5 ImageName: random ImageCollection: flags Label@PLAYER: @@ -528,8 +528,8 @@ Background@INGAME_OBSERVERSTATS_BG: Container@EARNED_THIS_MIN_GRAPH_TEMPLATE: X: 0 Y: 0 - Width: PARENT_RIGHT-100 - Height: PARENT_BOTTOM-50 + Width: PARENT_RIGHT - 100 + Height: PARENT_BOTTOM - 50 Children: LineGraph@EARNED_THIS_MIN_GRAPH: X: 0 diff --git a/mods/ts/chrome/ingame-player.yaml b/mods/ts/chrome/ingame-player.yaml index e70784c33d..e6018a2d97 100644 --- a/mods/ts/chrome/ingame-player.yaml +++ b/mods/ts/chrome/ingame-player.yaml @@ -22,8 +22,8 @@ Container@PLAYER_WIDGETS: Children: Image@ICON_TEMPLATE: Logic: AddFactionSuffixLogic - X: 0-2 - Y: 0-2 + X: 0 - 2 + Y: 0 - 2 Width: 64 Height: 48 IgnoreMouseOver: true @@ -170,7 +170,7 @@ Container@PLAYER_WIDGETS: Label@GAME_TIMER: Logic: GameTimerLogic X: 10 - Y: 0-1 + Y: 0 - 1 Width: PARENT_RIGHT Height: 22 Align: Center @@ -178,7 +178,7 @@ Container@PLAYER_WIDGETS: LabelWithTooltip@CASH: Logic: IngameCashCounterLogic X: 31 - Y: 0-2 + Y: 0 - 2 Width: 50 Height: 22 Font: Bold @@ -188,14 +188,14 @@ Container@PLAYER_WIDGETS: Children: Image@CASH_ICON: Logic: AddFactionSuffixLogic - X: 0-17 + X: 0 - 17 Y: 5 ImageCollection: cash-icons ImageName: cash-normal LabelWithTooltip@POWER: Logic: IngamePowerCounterLogic X: PARENT_RIGHT - WIDTH - 30 - Y: 0-2 + Y: 0 - 2 Width: 50 Height: 22 Align: Right @@ -261,7 +261,7 @@ Container@PLAYER_WIDGETS: ImageName: production-iconoverlay Container@PRODUCTION_TYPES: X: 0 - Y: 0-32 + Y: 0 - 32 Width: 235 Height: 311 Children: diff --git a/mods/ts/chrome/mainmenu-prerelease-notification.yaml b/mods/ts/chrome/mainmenu-prerelease-notification.yaml index b65fabc6d7..b6669c632b 100644 --- a/mods/ts/chrome/mainmenu-prerelease-notification.yaml +++ b/mods/ts/chrome/mainmenu-prerelease-notification.yaml @@ -1,7 +1,7 @@ Background@MAINMENU_PRERELEASE_NOTIFICATION: Logic: PreReleaseWarningPrompt - X: (WINDOW_RIGHT - WIDTH)/2 - Y: (WINDOW_BOTTOM - HEIGHT)/2 + X: (WINDOW_RIGHT - WIDTH) / 2 + Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 520 Height: 195 Children: