mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make WW and WH static

This commit is contained in:
Gymnasiast 2020-05-09 17:05:01 +02:00
parent f8aeb70398
commit 6fd83fd006
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
26 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2-ui/windows/About.cpp
View File

@ -16,8 +16,8 @@
#include <openrct2/localisation/LocalisationService.h>
#include <openrct2/sprites.h>
constexpr int32_t WW = 400;
constexpr int32_t WH = 350;
static constexpr const int32_t WW = 400;
static constexpr const int32_t WH = 350;
static constexpr const rct_string_id WINDOW_TITLE = STR_ABOUT;
constexpr int32_t TABHEIGHT = 50;

4
src/openrct2-ui/windows/Banner.cpp
View File

@ -22,8 +22,8 @@
#include <openrct2/world/Banner.h>
#include <openrct2/world/Scenery.h>
constexpr int32_t WW = 113;
constexpr int32_t WH = 96;
static constexpr const int32_t WW = 113;
static constexpr const int32_t WH = 96;
static constexpr const rct_string_id WINDOW_TITLE = STR_BANNER_WINDOW_TITLE;
// clang-format off

4
src/openrct2-ui/windows/Changelog.cpp
View File

@ -32,8 +32,8 @@ enum {
WIDX_SCROLL
};
constexpr int32_t WW = 500;
constexpr int32_t WH = 400;
static constexpr const int32_t WW = 500;
static constexpr const int32_t WH = 400;
static constexpr const rct_string_id WINDOW_TITLE = STR_CHANGELOG_TITLE;
constexpr int32_t MIN_WW = 300;
constexpr int32_t MIN_WH = 200;

4
src/openrct2-ui/windows/Cheats.cpp
View File

@ -177,8 +177,8 @@ enum WINDOW_CHEATS_WIDGET_IDX
#pragma region MEASUREMENTS
static constexpr const rct_string_id WINDOW_TITLE = STR_CHEAT_TITLE;
constexpr int32_t WW = 249;
constexpr int32_t WH = 300;
static constexpr const int32_t WW = 249;
static constexpr const int32_t WH = 300;
constexpr int32_t TAB_HEIGHT = 43;
constexpr int32_t XSPA = 5; // X spacing
constexpr int32_t YSPA = 5; // Y spacing

4
src/openrct2-ui/windows/DemolishRidePrompt.cpp
View File

@ -16,8 +16,8 @@
#include <openrct2/windows/Intent.h>
#include <openrct2/world/Park.h>
constexpr int32_t WW = 200;
constexpr int32_t WH = 100;
static constexpr const int32_t WW = 200;
static constexpr const int32_t WH = 100;
static constexpr const rct_string_id WINDOW_TITLE = STR_DEMOLISH_RIDE;
static money32 _demolishRideCost;

4
src/openrct2-ui/windows/EditorInventionsList.cpp
View File

@ -26,8 +26,8 @@
#pragma region Widgets
constexpr int32_t WW = 600;
constexpr int32_t WH = 400;
static constexpr const int32_t WW = 600;
static constexpr const int32_t WH = 400;
static constexpr const rct_string_id WINDOW_TITLE = STR_INVENTION_LIST;
// clang-format off

6
src/openrct2-ui/windows/InstallTrack.cpp
View File

@ -35,9 +35,9 @@ enum {
};
static constexpr const rct_string_id WINDOW_TITLE = STR_TRACK_DESIGN_INSTALL_WINDOW_TITLE;
constexpr int32_t WW = 380;
constexpr int32_t WH = 448;
constexpr int32_t WW_LESS_PADDING = WW - 4;
static constexpr const int32_t WW = 380;
static constexpr const int32_t WH = 448;
static constexpr const int32_t WW_LESS_PADDING = WW - 4;
constexpr int32_t PREVIEW_BUTTONS_LEFT = WW - 25;
constexpr int32_t ACTION_BUTTONS_LEFT = WW - 100;

4
src/openrct2-ui/windows/LoadSave.cpp
View File

@ -39,8 +39,8 @@
#pragma region Widgets
static constexpr const rct_string_id WINDOW_TITLE = STR_NONE;
constexpr int32_t WW = 350;
constexpr int32_t WH = 400;
static constexpr const int32_t WW = 350;
static constexpr const int32_t WH = 400;
// clang-format off
enum

4
src/openrct2-ui/windows/MapGen.cpp
View File

@ -111,8 +111,8 @@ enum {
#pragma region Widgets
static constexpr const rct_string_id WINDOW_TITLE = STR_MAPGEN_WINDOW_TITLE;
constexpr int32_t WW = 250;
constexpr int32_t WH = 273;
static constexpr const int32_t WW = 250;
static constexpr const int32_t WH = 273;
#define SHARED_WIDGETS \
WINDOW_SHIM(WINDOW_TITLE, WW, WH), /* WIDX_BACKGROUND, WIDX_TITLE, WIDX_CLOSE */ \

4
src/openrct2-ui/windows/Network.cpp
View File

@ -26,8 +26,8 @@ enum {
WINDOW_NETWORK_PAGE_INFORMATION,
};
constexpr int32_t WW = 450;
constexpr int32_t WH = 210;
static constexpr const int32_t WW = 450;
static constexpr const int32_t WH = 210;
enum WINDOW_NETWORK_WIDGET_IDX {
WIDX_BACKGROUND,

4
src/openrct2-ui/windows/NewRide.cpp
View File

@ -36,8 +36,8 @@
static constexpr const rct_string_id WINDOW_TITLE = STR_NONE;
constexpr size_t AVAILABILITY_STRING_SIZE = 256;
constexpr int32_t WH = 382;
constexpr int32_t WW = 601;
static constexpr const int32_t WH = 382;
static constexpr const int32_t WW = 601;
static uint8_t _windowNewRideCurrentTab;
static RideSelection _windowNewRideHighlightedItem[6];

6
src/openrct2-ui/windows/ObjectLoadError.cpp
View File

@ -260,9 +260,9 @@ enum WINDOW_OBJECT_LOAD_ERROR_WIDGET_IDX {
WIDX_DOWNLOAD_ALL
};
constexpr int32_t WW = 450;
constexpr int32_t WH = 400;
constexpr int32_t WW_LESS_PADDING = WW - 5;
static constexpr const int32_t WW = 450;
static constexpr const int32_t WH = 400;
static constexpr const int32_t WW_LESS_PADDING = WW - 5;
constexpr int32_t NAME_COL_LEFT = 4;
constexpr int32_t SOURCE_COL_LEFT = (WW_LESS_PADDING / 4) + 1;
constexpr int32_t TYPE_COL_LEFT = 5 * WW_LESS_PADDING / 8 + 1;

4
src/openrct2-ui/windows/Options.cpp
View File

@ -201,8 +201,8 @@ enum WINDOW_OPTIONS_WIDGET_IDX {
};
static constexpr const rct_string_id WINDOW_TITLE = STR_OPTIONS_TITLE;
constexpr int32_t WW = 310;
constexpr int32_t WH = 332;
static constexpr const int32_t WW = 310;
static constexpr const int32_t WH = 332;
#ifndef DISABLE_TWITCH
#define TWITCH_TAB_SPRITE IMAGE_TYPE_REMAP | SPR_TAB

4
src/openrct2-ui/windows/ServerStart.cpp
View File

@ -46,8 +46,8 @@ enum {
WIDX_LOAD_SERVER
};
constexpr int32_t WW = 300;
constexpr int32_t WH = 154;
static constexpr const int32_t WW = 300;
static constexpr const int32_t WH = 154;
static rct_widget window_server_start_widgets[] = {
{ WWT_FRAME, 0, 0, WW-1, 0, WH-1, STR_NONE, STR_NONE }, // panel / background

4
src/openrct2-ui/windows/ShortcutKeyChange.cpp
View File

@ -16,8 +16,8 @@
#include <openrct2/localisation/Localisation.h>
static constexpr const rct_string_id WINDOW_TITLE = STR_SHORTCUT_CHANGE_TITLE;
constexpr int32_t WW = 250;
constexpr int32_t WH = 60;
static constexpr const int32_t WW = 250;
static constexpr const int32_t WH = 60;
// clang-format off
enum WINDOW_SHORTCUT_CHANGE_WIDGET_IDX {

8
src/openrct2-ui/windows/ShortcutKeys.cpp
View File

@ -16,11 +16,11 @@
#include <openrct2/localisation/Localisation.h>
static constexpr const rct_string_id WINDOW_TITLE = STR_SHORTCUTS_TITLE;
constexpr int32_t WW = 420;
constexpr int32_t WH = 280;
static constexpr const int32_t WW = 420;
static constexpr const int32_t WH = 280;
constexpr int32_t WW_SC_MAX = 1200;
constexpr int32_t WH_SC_MAX = 800;
static constexpr const int32_t WW_SC_MAX = 1200;
static constexpr const int32_t WH_SC_MAX = 800;
// clang-format off
enum WINDOW_SHORTCUT_WIDGET_IDX {

4
src/openrct2-ui/windows/Sign.cpp
View File

@ -26,8 +26,8 @@
#include <openrct2/world/Wall.h>
static constexpr const rct_string_id WINDOW_TITLE = STR_SIGN;
constexpr int32_t WW = 113;
constexpr int32_t WH = 96;
static constexpr const int32_t WW = 113;
static constexpr const int32_t WH = 96;
// clang-format off
enum WINDOW_SIGN_WIDGET_IDX {

4
src/openrct2-ui/windows/Staff.cpp
View File

@ -32,8 +32,8 @@
#include <openrct2/world/Sprite.h>
static constexpr const rct_string_id WINDOW_TITLE = STR_STRINGID;
constexpr int32_t WW = 190;
constexpr int32_t WH = 180;
static constexpr const int32_t WW = 190;
static constexpr const int32_t WH = 180;
// clang-format off
enum WINDOW_STAFF_PAGE {

4
src/openrct2-ui/windows/StaffFirePrompt.cpp
View File

@ -17,8 +17,8 @@
#include <openrct2/world/Sprite.h>
static constexpr const rct_string_id WINDOW_TITLE = STR_SACK_STAFF;
constexpr int32_t WW = 200;
constexpr int32_t WH = 100;
static constexpr const int32_t WW = 200;
static constexpr const int32_t WH = 100;
// clang-format off
enum WINDOW_STAFF_FIRE_WIDGET_IDX {

4
src/openrct2-ui/windows/StaffList.cpp
View File

@ -105,8 +105,8 @@ enum WINDOW_STAFF_LIST_WIDGET_IDX {
};
static constexpr const rct_string_id WINDOW_TITLE = STR_STAFF;
constexpr int32_t WW = 320;
constexpr int32_t WH = 270;
static constexpr const int32_t WW = 320;
static constexpr const int32_t WH = 270;
constexpr int32_t MAX_WW = 500;
constexpr int32_t MAX_WH = 450;

4
src/openrct2-ui/windows/TextInput.cpp
View File

@ -26,8 +26,8 @@
#include <openrct2/util/Util.h>
static constexpr const rct_string_id WINDOW_TITLE = STR_OPTIONS;
constexpr int32_t WW = 250;
constexpr int32_t WH = 90;
static constexpr const int32_t WW = 250;
static constexpr const int32_t WH = 90;
// clang-format off
enum WINDOW_TEXT_INPUT_WIDGET_IDX {

4
src/openrct2-ui/windows/TileInspector.cpp
View File

@ -206,8 +206,8 @@ enum WINDOW_TILE_INSPECTOR_WIDGET_IDX {
static constexpr const rct_string_id WINDOW_TITLE = STR_TILE_INSPECTOR_TITLE;
// Window sizes
constexpr int32_t WW = 400;
constexpr int32_t WH = 170;
static constexpr const int32_t WW = 400;
static constexpr const int32_t WH = 170;
constexpr int32_t MIN_WW = WW;
constexpr int32_t MAX_WW = WW;
constexpr int32_t MIN_WH = 130;

6
src/openrct2-ui/windows/TitleCommandEditor.cpp
View File

@ -69,12 +69,12 @@ enum WINDOW_WATER_WIDGET_IDX {
WIDX_CANCEL
};
constexpr int32_t WW = 200;
constexpr int32_t WH = 120;
static constexpr const int32_t WW = 200;
static constexpr const int32_t WH = 120;
constexpr int32_t BY = 32;
constexpr int32_t BY2 = 70;
constexpr int32_t WS = 16;
constexpr int32_t WHA = (WW-WS*2)/2;
static constexpr const int32_t WHA = (WW-WS*2)/2;
static bool _window_title_command_editor_insert;
static int32_t _window_title_command_editor_index;

6
src/openrct2-ui/windows/TitleEditor.cpp
View File

@ -135,15 +135,15 @@ enum WINDOW_TITLE_EDITOR_WIDGET_IDX {
// Increase BW if certain languages do not fit
// BW should be a multiple of 4
constexpr int32_t WW = 320;
constexpr int32_t WH = 270;
static constexpr const int32_t WW = 320;
static constexpr const int32_t WH = 270;
constexpr int32_t BX = 8;
constexpr int32_t BW = 72;
constexpr int32_t BY = 52;
constexpr int32_t BH = 63;
constexpr int32_t BS = 18;
constexpr int32_t SCROLL_WIDTH = 350;
constexpr int32_t WH2 = 127;
static constexpr const int32_t WH2 = 127;
static rct_widget window_title_editor_widgets[] = {
{ WWT_FRAME, 0, 0, WW-1, 0, WH2-1, 0xFFFFFFFF, STR_NONE }, // panel / background

4
src/openrct2-ui/windows/TitleLogo.cpp
View File

@ -14,8 +14,8 @@
#include <openrct2/localisation/Localisation.h>
#include <openrct2/sprites.h>
constexpr int32_t WW = 232;
constexpr int32_t WH = 136;
static constexpr const int32_t WW = 232;
static constexpr const int32_t WH = 136;
enum
{

4
src/openrct2-ui/windows/ViewClipping.cpp
View File

@ -45,8 +45,8 @@ static DISPLAY_TYPE gClipHeightDisplayType = DISPLAY_TYPE::DISPLAY_UNITS;
#pragma region Widgets
constexpr int32_t WW = 180;
constexpr int32_t WH = 155;
static constexpr const int32_t WW = 180;
static constexpr const int32_t WH = 155;
static rct_widget window_view_clipping_widgets[] = {
{ WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, STR_NONE, STR_NONE }, // panel / background