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

Implement #3994: Show bottom toolbar with map tooltip

Browse Source
This commit is contained in:
jensj12
2017-08-16 22:27:20 +02:00
committed by Michael Steenbeek
parent c75be48653
commit c3a5ffbe04
7 changed files with 113 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/interface/Theme.cpp
View File

@@ -210,7 +210,8 @@ UIThemeWindowEntry PredefinedThemeRCT2_Entries[] =
const UITheme PredefinedThemeRCT1 = UITheme::CreatePredefined(
"RCT1", PredefinedThemeRCT1_Entries, UITHEME_FLAG_USE_LIGHTS_RIDE |
UITHEME_FLAG_USE_LIGHTS_PARK |
UITHEME_FLAG_USE_ALTERNATIVE_SCENARIO_SELECT_FONT);
UITHEME_FLAG_USE_ALTERNATIVE_SCENARIO_SELECT_FONT |
UITHEME_FLAG_USE_FULL_BOTTOM_TOOLBAR);
const UITheme PredefinedThemeRCT2 = UITheme::CreatePredefined(
"RCT2", PredefinedThemeRCT2_Entries, 0);
@@ -393,6 +394,7 @@ json_t * UITheme::ToJson() const
json_object_set_new(jsonTheme,
"useAltScenarioSelectFont",
json_boolean(Flags & UITHEME_FLAG_USE_ALTERNATIVE_SCENARIO_SELECT_FONT));
json_object_set_new(jsonTheme, "useFullBottomToolbar", json_boolean(Flags & UITHEME_FLAG_USE_FULL_BOTTOM_TOOLBAR));
return jsonTheme;
}
@@ -443,6 +445,10 @@ UITheme * UITheme::FromJson(const json_t * json)
{
result->Flags |= UITHEME_FLAG_USE_ALTERNATIVE_SCENARIO_SELECT_FONT;
}
if (json_is_true(json_object_get(json, "useFullBottomToolbar")))
{
result->Flags |= UITHEME_FLAG_USE_FULL_BOTTOM_TOOLBAR;
}
const char * jkey;
json_t * jvalue;