dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjustments for PR #556

Browse Source 
Setting text/condition, tooltip condition
This commit is contained in:
Jonathan G Rennison
2023-06-24 23:29:44 +01:00
parent 4fae774cb5
commit 9a5df29648
7 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lang/extra/english.txt
View File

@@ -2122,5 +2122,5 @@ STR_TOWN_DIRECTORY_INFO :{BLACK}{STRING1
STR_GAME_OPTIONS_GUI_SCALE_MAIN_TOOLBAR :{BLACK}Bigger main toolbar STR_GAME_OPTIONS_GUI_SCALE_MAIN_TOOLBAR :{BLACK}Bigger main toolbar
STR_GAME_OPTIONS_GUI_SCALE_MAIN_TOOLBAR_TOOLTIP :{BLACK}Check this box to increase the scale of the main toolbar STR_GAME_OPTIONS_GUI_SCALE_MAIN_TOOLBAR_TOOLTIP :{BLACK}Check this box to increase the scale of the main toolbar
STR_CONFIG_SETTING_INSTANT_TILE_TOOLTIP :Show tooltips for tiles without a right-click: {STRING2} STR_CONFIG_SETTING_INSTANT_TILE_TOOLTIP :Show viewport tooltips for tiles without a right-click: {STRING2}
STR_CONFIG_SETTING_INSTANT_TILE_TOOLTIP_HELPTEXT :Allow tooltips for tiles, such as industries, to show without the need for a right-click, if latter is set to be necessary for all tooltips. STR_CONFIG_SETTING_INSTANT_TILE_TOOLTIP_HELPTEXT :Show viewport tooltips for tile types such as industries without requiring a right-click, when the show tooltips setting is set to right-click.

3
src/main_gui.cpp
View File

@@ -528,8 +528,7 @@ struct MainWindow : Window
virtual void OnMouseOver(Point pt, int widget) override virtual void OnMouseOver(Point pt, int widget) override
{ {
if (pt.x != -1 && _game_mode != GM_MENU && if (pt.x != -1 && _game_mode != GM_MENU && IsViewportMouseHoverActive()) {
(_settings_client.gui.hover_delay_ms == 0 && (_right_button_down || _settings_client.gui.instant_tile_tooltip) || _mouse_hovering)) {
/* Show tooltip with last month production or town name */ /* Show tooltip with last month production or town name */
const Point p = GetTileBelowCursor(); const Point p = GetTileBelowCursor();
const TileIndex tile = TileVirtXY(p.x, p.y); const TileIndex tile = TileVirtXY(p.x, p.y);

2
src/settings_gui.cpp
View File

@@ -1924,7 +1924,7 @@ static SettingsContainer &GetSettingsTree()
{ {
general->Add(new SettingEntry("gui.osk_activation")); general->Add(new SettingEntry("gui.osk_activation"));
general->Add(new SettingEntry("gui.hover_delay_ms")); general->Add(new SettingEntry("gui.hover_delay_ms"));
general->Add(new SettingEntry("gui.instant_tile_tooltip")); general->Add(new ConditionallyHiddenSettingEntry("gui.instant_tile_tooltip", []() -> bool { return _settings_client.gui.hover_delay_ms != 0; }));
general->Add(new SettingEntry("gui.errmsg_duration")); general->Add(new SettingEntry("gui.errmsg_duration"));
general->Add(new SettingEntry("gui.window_snap_radius")); general->Add(new SettingEntry("gui.window_snap_radius"));
general->Add(new SettingEntry("gui.window_soft_limit")); general->Add(new SettingEntry("gui.window_soft_limit"));

3
src/table/settings/settings.ini
View File

@@ -4543,11 +4543,12 @@ interval = 50
str = STR_CONFIG_SETTING_HOVER_DELAY str = STR_CONFIG_SETTING_HOVER_DELAY
strhelp = STR_CONFIG_SETTING_HOVER_DELAY_HELPTEXT strhelp = STR_CONFIG_SETTING_HOVER_DELAY_HELPTEXT
strval = STR_CONFIG_SETTING_HOVER_DELAY_VALUE strval = STR_CONFIG_SETTING_HOVER_DELAY_VALUE
post_cb = [](auto) { InvalidateWindowClassesData(WC_GAME_OPTIONS); }
[SDTC_BOOL] [SDTC_BOOL]
var = gui.instant_tile_tooltip var = gui.instant_tile_tooltip
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
def = true def = false
str = STR_CONFIG_SETTING_INSTANT_TILE_TOOLTIP str = STR_CONFIG_SETTING_INSTANT_TILE_TOOLTIP
strhelp = STR_CONFIG_SETTING_INSTANT_TILE_TOOLTIP_HELPTEXT strhelp = STR_CONFIG_SETTING_INSTANT_TILE_TOOLTIP_HELPTEXT

11
src/viewport.cpp
View File

@@ -6703,3 +6703,14 @@ int GetSlopeTreeBrightnessAdjust(Slope slope)
return 0; return 0;
} }
} }
bool IsViewportMouseHoverActive()
{
if (_settings_client.gui.hover_delay_ms == 0) {
/* right click mode */
return _right_button_down || _settings_client.gui.instant_tile_tooltip;
} else {
/* normal mode */
return _mouse_hovering;
}
}

2
src/viewport_func.h
View File

@@ -170,4 +170,6 @@ void MarkBridgeDirty(TileIndex tile, ViewportMarkDirtyFlags flags = VMDF_NONE);
void MarkBridgeOrTunnelDirty(TileIndex tile, ViewportMarkDirtyFlags flags = VMDF_NONE); void MarkBridgeOrTunnelDirty(TileIndex tile, ViewportMarkDirtyFlags flags = VMDF_NONE);
void MarkBridgeOrTunnelDirtyOnReservationChange(TileIndex tile, ViewportMarkDirtyFlags flags = VMDF_NONE); void MarkBridgeOrTunnelDirtyOnReservationChange(TileIndex tile, ViewportMarkDirtyFlags flags = VMDF_NONE);
bool IsViewportMouseHoverActive();
#endif /* VIEWPORT_FUNC_H */ #endif /* VIEWPORT_FUNC_H */

2
src/viewport_gui.cpp
View File

@@ -158,7 +158,7 @@ public:
virtual void OnMouseOver(Point pt, int widget) override virtual void OnMouseOver(Point pt, int widget) override
{ {
if (pt.x != -1 && (_settings_client.gui.hover_delay_ms == 0 && (_right_button_down || _settings_client.gui.instant_tile_tooltip) || _mouse_hovering)) { if (pt.x != -1 && IsViewportMouseHoverActive()) {
/* Show tooltip with last month production or town name */ /* Show tooltip with last month production or town name */
const Point p = GetTileBelowCursor(); const Point p = GetTileBelowCursor();
const TileIndex tile = TileVirtXY(p.x, p.y); const TileIndex tile = TileVirtXY(p.x, p.y);