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

Close #12408: Refactor CURSOR_ID to use strong enum

Browse Source
This commit is contained in:
Julia Pinheiro
2020-10-11 13:01:14 -03:00
committed by GitHub
parent f56039abfd
commit cba1d48226
25 changed files with 156 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2-ui/CursorRepository.cpp
View File

@@ -20,22 +20,22 @@ using namespace OpenRCT2::Ui;
CursorRepository::~CursorRepository()
{
_scaledCursors.clear();
_currentCursor = CURSOR_UNDEFINED;
_currentCursor = CursorID::Undefined;
_currentCursorScale = 1;
}
void CursorRepository::LoadCursors()
{
SetCursorScale(static_cast<uint8_t>(round(gConfigGeneral.window_scale)));
SetCurrentCursor(CURSOR_ARROW);
SetCurrentCursor(CursorID::Arrow);
}
CURSOR_ID CursorRepository::GetCurrentCursor()
CursorID CursorRepository::GetCurrentCursor()
{
return _currentCursor;
}
void CursorRepository::SetCurrentCursor(CURSOR_ID cursorId)
void CursorRepository::SetCurrentCursor(CursorID cursorId)
{
if (_currentCursor != cursorId)
{
@@ -120,13 +120,13 @@ void CursorRepository::GenerateScaledCursorSetHolder(uint8_t scale)
{
if (_scaledCursors.find(scale) == _scaledCursors.end())
{
std::function<SDL_Cursor*(CURSOR_ID)> cursorGenerator = [this, scale](CURSOR_ID cursorId) {
std::function<SDL_Cursor*(CursorID)> cursorGenerator = [this, scale](CursorID cursorId) {
switch (cursorId)
{
// We can't scale the system cursors, but they should be appropriately scaled anyway
case CURSOR_ARROW:
case CursorID::Arrow:
return SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_ARROW);
case CURSOR_HAND_POINT:
case CursorID::HandPoint:
return SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_HAND);
default:
return this->Create(GetCursorData(cursorId), scale);