From acd45e6f75ea6488645fd9eef7ed067d0bf5870d Mon Sep 17 00:00:00 2001 From: Hielke Morsink Date: Sat, 26 Jun 2021 10:54:38 +0200 Subject: [PATCH] Redesign About window (#14841) --- data/language/en-GB.txt | 1 + distribution/changelog.txt | 1 + src/openrct2-ui/windows/About.cpp | 73 +++++++++++++-------------- src/openrct2/localisation/StringIds.h | 2 + 4 files changed, 40 insertions(+), 37 deletions(-) diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index e53cab8acb..3813f7521e 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -3695,6 +3695,7 @@ STR_6449 :{WINDOW_COLOUR_2}Tracks: STR_6450 :{BLACK}“{STRING}” STR_6451 :{BLACK}“{STRING}” - {STRING} STR_6452 :{WINDOW_COLOUR_2}Sells: {BLACK}{STRING} +STR_6453 :Copy version info ############# # Scenarios # diff --git a/distribution/changelog.txt b/distribution/changelog.txt index fb68f9c27c..440c7fea34 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -10,6 +10,7 @@ - Change: [#14496] [Plugin] Rename Object to LoadedObject to fix conflicts with Typescript's Object interface. - Change: [#14536] [Plugin] Rename ListView to ListViewWidget to make it consistent with names of other widgets. - Change: [#14751] “No construction above tree height” limitation now allows placing high trees. +- Change: [#14841] Redesign the About window, including new button to copy the current version info. - Fix: [#11829] Visual glitches and crashes when using RCT1 assets from mismatched or corrupt CSG1.DAT and CSG1i.DAT files. - Fix: [#13581] Opening the Options menu causes a noticeable drop in FPS. - Fix: [#13894] Block brakes do not animate. diff --git a/src/openrct2-ui/windows/About.cpp b/src/openrct2-ui/windows/About.cpp index 6c4b531874..f7f776689b 100644 --- a/src/openrct2-ui/windows/About.cpp +++ b/src/openrct2-ui/windows/About.cpp @@ -7,10 +7,12 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ +#include #include #include #include #include +#include #include #include #include @@ -18,9 +20,9 @@ #include static constexpr const int32_t WW = 400; -static constexpr const int32_t WH = 385; +static constexpr const int32_t WH = 352; static constexpr const rct_string_id WINDOW_TITLE = STR_ABOUT; -constexpr int32_t TABHEIGHT = 50; +static constexpr const int32_t TABHEIGHT = 50; // clang-format off enum @@ -40,9 +42,15 @@ enum WINDOW_ABOUT_WIDGET_IDX { WIDX_PAGE_START, // About OpenRCT2 - WIDX_CHANGELOG = WIDX_PAGE_START, - WIDX_JOIN_DISCORD, + WIDX_INTRO = WIDX_PAGE_START, + WIDX_OPENRCT2_LOGO, + WIDX_VERSION, + WIDX_COPY_BUILD_INFO, WIDX_NEW_VERSION, + WIDX_CHANGELOG, + WIDX_JOIN_DISCORD, + WIDX_CONTRIBUTORS, + WIDX_COPYRIGHT, // About RCT2 WIDX_MUSIC_CREDITS = WIDX_PAGE_START, @@ -56,9 +64,15 @@ enum WINDOW_ABOUT_WIDGET_IDX { static rct_widget window_about_openrct2_widgets[] = { WIDGETS_MAIN, - MakeWidget({100, WH - TABHEIGHT - (14 + 3) * 2}, {200, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_CHANGELOG_ELLIPSIS), // changelog button - MakeWidget({100, WH - TABHEIGHT - (14 + 3) * 1}, {200, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_JOIN_DISCORD ), // "join discord" button - MakeWidget({100, WH - TABHEIGHT - (14 + 3) * 0}, {200, 14}, WindowWidgetType::Placeholder, WindowColour::Secondary, STR_UPDATE_AVAILABLE ), // "new version" button + MakeWidget({10, 60}, {WW - 20, 20}, WindowWidgetType::LabelCentred, WindowColour::Secondary, STR_ABOUT_OPENRCT2_DESCRIPTION), // Introduction + MakeWidget({30, 90}, {128, 128}, WindowWidgetType::Placeholder, WindowColour::Secondary, STR_NONE), // OpenRCT2 Logo + MakeWidget({168, 100}, {173, 24}, WindowWidgetType::Placeholder, WindowColour::Secondary, STR_NONE), // Build version + MakeWidget({344, 100 }, {24, 24}, WindowWidgetType::ImgBtn, WindowColour::Secondary, SPR_G2_COPY, STR_COPY_BUILD_HASH ), // "Copy build info" button + MakeWidget({168, 115 + 24}, {200, 14}, WindowWidgetType::Placeholder, WindowColour::Secondary, STR_UPDATE_AVAILABLE ), // "new version" button + MakeWidget({168, 115 + 48}, {200, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_CHANGELOG_ELLIPSIS), // changelog button + MakeWidget({168, 115 + 72}, {200, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_JOIN_DISCORD ), // "join discord" button + MakeWidget({10, 250}, {WW - 20, 50}, WindowWidgetType::LabelCentred, WindowColour::Secondary, STR_ABOUT_OPENRCT2_DESCRIPTION_2), // Contributors + MakeWidget({10, 300}, {WW - 20, 50}, WindowWidgetType::LabelCentred, WindowColour::Secondary, STR_ABOUT_OPENRCT2_DESCRIPTION_3), // Copyright { WIDGETS_END } }; @@ -77,7 +91,7 @@ static rct_widget *window_about_page_widgets[] = { (1ULL << WIDX_CLOSE) | (1ULL << WIDX_TAB_ABOUT_OPENRCT2) | (1ULL << WIDX_TAB_ABOUT_RCT2) static uint64_t window_about_page_enabled_widgets[] = { - DEFAULT_ENABLED_WIDGETS | (1ULL << WIDX_CHANGELOG) | (1 << WIDX_JOIN_DISCORD), + DEFAULT_ENABLED_WIDGETS | (1ULL << WIDX_COPY_BUILD_INFO) | (1ULL << WIDX_CHANGELOG) | (1ULL << WIDX_JOIN_DISCORD), DEFAULT_ENABLED_WIDGETS | (1ULL << WIDX_MUSIC_CREDITS), }; @@ -154,6 +168,9 @@ static void window_about_openrct2_mouseup(rct_window* w, rct_widgetindex widgetI case WIDX_NEW_VERSION: context_open_window_view(WV_NEW_VERSION_INFO); break; + case WIDX_COPY_BUILD_INFO: + SDL_SetClipboardText(gVersionInfoFull); + break; } } @@ -168,6 +185,7 @@ static void window_about_openrct2_common_paint(rct_window* w, rct_drawpixelinfo* ScreenCoordsXY aboutOpenRCT2Coords(w->windowPos.x + aboutOpenRCT2.left + 45, y); ScreenCoordsXY aboutRCT2Coords(w->windowPos.x + aboutRCT2.left + 45, y); + // Draw tab names { auto ft = Formatter(); ft.Add(STR_TITLE_SEQUENCE_OPENRCT2); @@ -186,33 +204,10 @@ static void window_about_openrct2_paint(rct_window* w, rct_drawpixelinfo* dpi) { window_about_openrct2_common_paint(w, dpi); - int32_t lineHeight = font_get_line_height(FontSpriteBase::MEDIUM); - - ScreenCoordsXY aboutCoords( - w->windowPos.x + (w->width / 2), w->windowPos.y + w->widgets[WIDX_PAGE_BACKGROUND].top + lineHeight); - int32_t width = w->width - 20; - - aboutCoords.y += DrawTextWrapped( - dpi, aboutCoords, width, STR_ABOUT_OPENRCT2_DESCRIPTION, {}, { w->colours[1], TextAlignment::CENTRE }) - + lineHeight; - - rct_size16 logoSize = gfx_get_sprite_size(SPR_G2_LOGO); - gfx_draw_sprite(dpi, ImageId(SPR_G2_LOGO), aboutCoords - ScreenCoordsXY{ logoSize.width / 2, 0 }); - aboutCoords.y += logoSize.height + lineHeight * 2; - - // About OpenRCT2 text - aboutCoords.y += DrawTextWrapped( - dpi, aboutCoords, width, STR_ABOUT_OPENRCT2_DESCRIPTION_2, {}, - { w->colours[1], TextAlignment::CENTRE }) - + lineHeight + 5; - - // Copyright disclaimer; hidden when using truetype fonts to prevent - // the text from overlapping the changelog button. - if (!LocalisationService_UseTrueTypeFont()) - { - DrawTextWrapped( - dpi, aboutCoords, width, STR_ABOUT_OPENRCT2_DESCRIPTION_3, {}, { w->colours[1], TextAlignment::CENTRE }); - } + // Draw logo on placeholder widget + ScreenCoordsXY logoCoords = w->windowPos + + ScreenCoordsXY(w->widgets[WIDX_OPENRCT2_LOGO].left, w->widgets[WIDX_OPENRCT2_LOGO].top); + gfx_draw_sprite(dpi, ImageId(SPR_G2_LOGO), logoCoords); // Version info utf8 buffer[256]; @@ -221,8 +216,12 @@ static void window_about_openrct2_paint(rct_window* w, rct_drawpixelinfo* dpi) auto ft = Formatter(); ft.Add(buffer); - aboutCoords.y = w->windowPos.y + WH - 25; - DrawTextWrapped(dpi, aboutCoords, width, STR_STRING, ft, { w->colours[1], TextAlignment::CENTRE }); + auto const& versionPlaceholder = w->widgets[WIDX_VERSION]; + auto width = versionPlaceholder.right - versionPlaceholder.left; + auto centreX = versionPlaceholder.left + width / 2; + auto centreY = (versionPlaceholder.top + versionPlaceholder.bottom - font_get_line_height(FontSpriteBase::MEDIUM)) / 2; + auto centrePos = w->windowPos + ScreenCoordsXY(centreX, centreY); + DrawTextWrapped(dpi, centrePos, width, STR_STRING, ft, { w->colours[1], TextAlignment::CENTRE }); } static void window_about_openrct2_invalidate(rct_window* w) diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h index 44a88c77a0..3ee0e0f04d 100644 --- a/src/openrct2/localisation/StringIds.h +++ b/src/openrct2/localisation/StringIds.h @@ -3949,6 +3949,8 @@ enum STR_RIDE_OBJECT_SHOP_SELLS = 6452, + STR_COPY_BUILD_HASH = 6453, + // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working /* MAX_STR_COUNT = 32768 */ // MAX_STR_COUNT - upper limit for number of strings, not the current count strings };