mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 13:42:55 +01:00
Code Issues Releases Wiki Activity

Move initialization to constructor

Browse Source
This commit is contained in:
Hielke Morsink
2022-10-04 23:59:46 +02:00
parent e22dd3ac32
commit 056af36cdf
2 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -396,7 +396,7 @@ static void Select(const char* path)
}
}
static u8string Browse(bool isSave)
static u8string OpenSystemFileBrowser(bool isSave)
{
OpenRCT2::Ui::FileDialogDesc desc = {};
u8string extension{};
@@ -484,9 +484,32 @@ static u8string Browse(bool isSave)
class LoadSaveWindow final : public Window
{
public:
LoadSaveWindow()
LoadSaveWindow(int32_t type)
{
widgets = window_loadsave_widgets;
min_width = WW;
min_height = WH / 2;
max_width = WW * 2;
max_height = WH * 2;
const auto uiContext = OpenRCT2::GetContext()->GetUiContext();
if (!uiContext->HasFilePicker())
{
disabled_widgets |= (1uLL << WIDX_BROWSE);
window_loadsave_widgets[WIDX_BROWSE].type = WindowWidgetType::Empty;
}
const bool isSave = (type & 0x01) == LOADSAVETYPE_SAVE;
const auto path = GetDir(type);
const char* pattern = GetFilterPatternByType(type, isSave);
PopulateList(isSave, path, pattern);
no_list_items = static_cast<uint16_t>(_listItems.size());
selected_list_item = -1;
InitScrollWidgets();
ComputeMaxDateWidth();
}
private:
@@ -789,7 +812,7 @@ public:
case WIDX_BROWSE:
{
u8string path = Browse(isSave);
u8string path = OpenSystemFileBrowser(isSave);
if (!path.empty())
{
Select(path.c_str());
@@ -1014,7 +1037,7 @@ rct_window* WindowLoadsaveOpen(
auto hasFilePicker = OpenRCT2::GetContext()->GetUiContext()->HasFilePicker();
if (gConfigGeneral.UseNativeBrowseDialog && hasFilePicker)
{
const u8string path = Browse(isSave);
const u8string path = OpenSystemFileBrowser(isSave);
if (!path.empty())
{
Select(path.c_str());
@@ -1028,26 +1051,9 @@ rct_window* WindowLoadsaveOpen(
if (w == nullptr)
{
w = WindowCreate<LoadSaveWindow>(
WindowClass::Loadsave, WW, WH, WF_STICK_TO_FRONT | WF_RESIZABLE | WF_AUTO_POSITION | WF_CENTRE_SCREEN);
w->widgets = window_loadsave_widgets;
w->min_width = WW;
w->min_height = WH / 2;
w->max_width = WW * 2;
w->max_height = WH * 2;
if (!hasFilePicker)
{
w->disabled_widgets |= (1uLL << WIDX_BROWSE);
window_loadsave_widgets[WIDX_BROWSE].type = WindowWidgetType::Empty;
}
WindowClass::Loadsave, WW, WH, WF_STICK_TO_FRONT | WF_RESIZABLE | WF_AUTO_POSITION | WF_CENTRE_SCREEN, type);
}
const char* pattern = GetFilterPatternByType(type, isSave);
w->PopulateList(isSave, path.c_str(), pattern);
w->no_list_items = static_cast<uint16_t>(_listItems.size());
w->selected_list_item = -1;
switch (type & 0x0E)
{
case LOADSAVETYPE_GAME:
@@ -1074,11 +1080,9 @@ rct_window* WindowLoadsaveOpen(
default:
openrct2_assert(true, "Unsupported load/save type: %d", type & 0x0F);
break;
}
WindowInitScrollWidgets(*w);
// WindowLoadsaveComputeMaxDateWidth();
return w;
}

8
src/openrct2/interface/Window.h
View File

@@ -22,6 +22,7 @@
#include <limits>
#include <list>
#include <memory>
#include <utility>
#include <variant>
struct rct_drawpixelinfo;
@@ -567,10 +568,11 @@ T* WindowCreate(WindowClass cls, const ScreenCoordsXY& pos = {}, int32_t width =
{
return static_cast<T*>(WindowCreate(std::make_unique<T>(), cls, pos, width, height, flags));
}
template<typename T, typename std::enable_if<std::is_base_of<rct_window, T>::value>::type* = nullptr>
T* WindowCreate(WindowClass cls, int32_t width, int32_t height, uint32_t flags = 0)
template<typename T, typename... TArgs, typename std::enable_if<std::is_base_of<rct_window, T>::value>::type* = nullptr>
T* WindowCreate(WindowClass cls, int32_t width, int32_t height, uint32_t flags = 0, TArgs&&... args)
{
return static_cast<T*>(WindowCreate(std::make_unique<T>(), cls, {}, width, height, flags | WF_AUTO_POSITION));
return static_cast<T*>(
WindowCreate(std::make_unique<T>(std::forward<TArgs>(args)...), cls, {}, width, height, flags | WF_AUTO_POSITION));
}
template<typename T, typename std::enable_if<std::is_base_of<rct_window, T>::value>::type* = nullptr>
T* WindowFocusOrCreate(WindowClass cls, const ScreenCoordsXY& pos, int32_t width, int32_t height, uint32_t flags = 0)