amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-26 00:45:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: make WindowClass a scoped enum

Browse Source
This commit is contained in:
Rubidium
2026-05-20 21:39:04 +02:00
committed by rubidium42
parent a9a2965131
commit bcda4a72ee
134 changed files with 1361 additions and 1249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/toolbar_gui.cpp
+5 -5
View File
@@ -207,7 +207,7 @@ static CallBackFunction SelectSignTool()
ResetObjectToPlace();
return CallBackFunction::None;
} else {
SetObjectToPlace(SPR_CURSOR_SIGN, PAL_NONE, HT_RECT, WC_MAIN_TOOLBAR, 0);
SetObjectToPlace(SPR_CURSOR_SIGN, PAL_NONE, HT_RECT, WindowClass::MainToolbar, 0);
return CallBackFunction::PlaceSign;
}
}
@@ -337,7 +337,7 @@ static CallBackFunction MenuClickSettings(int index)
case OptionMenuEntries::ShowSigns: _display_opt.Flip(DisplayOption::ShowSigns); break;
case OptionMenuEntries::ShowCompetitorSigns:
_display_opt.Flip(DisplayOption::ShowCompetitorSigns);
InvalidateWindowClassesData(WC_SIGN_LIST, -1);
InvalidateWindowClassesData(WindowClass::SignList, -1);
break;
case OptionMenuEntries::FullAnimation: _display_opt.Flip(DisplayOption::FullAnimation); CheckBlitter(); break;
case OptionMenuEntries::FullDetails: _display_opt.Flip(DisplayOption::FullDetail); break;
@@ -1075,7 +1075,7 @@ static CallBackFunction PlaceLandBlockInfo()
ResetObjectToPlace();
return CallBackFunction::None;
} else {
SetObjectToPlace(SPR_CURSOR_QUERY, PAL_NONE, HT_RECT, WC_MAIN_TOOLBAR, 0);
SetObjectToPlace(SPR_CURSOR_QUERY, PAL_NONE, HT_RECT, WindowClass::MainToolbar, 0);
return CallBackFunction::PlaceLandInfo;
}
}
@@ -2265,7 +2265,7 @@ static constexpr std::initializer_list<NWidgetPart> _nested_toolbar_normal_widge
/** Window definition for the normal (top) toolbar. */
static WindowDesc _toolb_normal_desc(
WindowPosition::Manual, {}, 0, 0,
WC_MAIN_TOOLBAR, WC_NONE,
WindowClass::MainToolbar, WindowClass::None,
{WindowDefaultFlag::NoFocus, WindowDefaultFlag::NoClose},
_nested_toolbar_normal_widgets,
&MainToolbarWindow::hotkeys
@@ -2609,7 +2609,7 @@ static constexpr std::initializer_list<NWidgetPart> _nested_toolb_scen_widgets =
/** Window definition for the scenario editor (top) toolbar window. */
static WindowDesc _toolb_scen_desc(
WindowPosition::Manual, {}, 0, 0,
WC_MAIN_TOOLBAR, WC_NONE,
WindowClass::MainToolbar, WindowClass::None,
{WindowDefaultFlag::NoFocus, WindowDefaultFlag::NoClose},
_nested_toolb_scen_widgets,
&ScenarioEditorToolbarWindow::hotkeys