mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

No longer invalidate widgets on every draw

Browse Source
This commit is contained in:
Michael Bernardi
2023-07-23 00:27:26 +02:00
parent d850a535aa
commit dc018c93d9
3 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2-ui/interface/Window.cpp
View File

@@ -737,6 +737,16 @@ void Window::SetWidgetDisabled(WidgetIndex widgetIndex, bool value)
WidgetSetDisabled(*this, widgetIndex, value); WidgetSetDisabled(*this, widgetIndex, value);
} }
void Window::SetWidgetDisabledAndInvalidate(WidgetIndex widgetIndex, bool value)
{
bool oldState = IsWidgetDisabled(widgetIndex);
if (oldState != value)
{
WidgetSetDisabled(*this, widgetIndex, value);
InvalidateWidget(widgetIndex);
}
}
void Window::SetWidgetPressed(WidgetIndex widgetIndex, bool value) void Window::SetWidgetPressed(WidgetIndex widgetIndex, bool value)
{ {
WidgetSetPressed(*this, widgetIndex, value); WidgetSetPressed(*this, widgetIndex, value);

1
src/openrct2-ui/interface/Window.h
View File

@@ -24,6 +24,7 @@ struct Window : WindowBase
bool IsWidgetPressed(WidgetIndex widgetIndex) const; bool IsWidgetPressed(WidgetIndex widgetIndex) const;
void SetWidgetEnabled(WidgetIndex widgetIndex, bool value); void SetWidgetEnabled(WidgetIndex widgetIndex, bool value);
void SetWidgetDisabled(WidgetIndex widgetIndex, bool value); void SetWidgetDisabled(WidgetIndex widgetIndex, bool value);
void SetWidgetDisabledAndInvalidate(WidgetIndex widgetIndex, bool value);
void SetWidgetPressed(WidgetIndex widgetIndex, bool value); void SetWidgetPressed(WidgetIndex widgetIndex, bool value);
void SetCheckboxValue(WidgetIndex widgetIndex, bool value); void SetCheckboxValue(WidgetIndex widgetIndex, bool value);
void DrawWidgets(DrawPixelInfo& dpi); void DrawWidgets(DrawPixelInfo& dpi);

27
src/openrct2-ui/windows/TileInspector.cpp
View File

@@ -506,8 +506,9 @@ public:
// Check if the mouse is hovering over the list // Check if the mouse is hovering over the list
if (!WidgetIsHighlighted(*this, WIDX_LIST)) if (!WidgetIsHighlighted(*this, WIDX_LIST))
{ {
if (_highlightedIndex != -1)
InvalidateWidget(WIDX_LIST);
_highlightedIndex = -1; _highlightedIndex = -1;
InvalidateWidget(WIDX_LIST);
} }
if (gCurrentToolWidget.window_classification != WindowClass::TileInspector) if (gCurrentToolWidget.window_classification != WindowClass::TileInspector)
Close(); Close();
@@ -2040,32 +2041,30 @@ private:
Invalidate(); Invalidate();
} }
// X and Y spinners // X and Y spinners
SetWidgetDisabled(WIDX_SPINNER_X_INCREASE, !(_tileSelected && ((_toolMap.x / 32) < MAXIMUM_MAP_SIZE_TECHNICAL - 1))); SetWidgetDisabledAndInvalidate(
SetWidgetDisabled(WIDX_SPINNER_X_DECREASE, !(_tileSelected && ((_toolMap.x / 32) > 0))); WIDX_SPINNER_X_INCREASE, !(_tileSelected && ((_toolMap.x / 32) < MAXIMUM_MAP_SIZE_TECHNICAL - 1)));
SetWidgetDisabled(WIDX_SPINNER_Y_INCREASE, !(_tileSelected && ((_toolMap.y / 32) < MAXIMUM_MAP_SIZE_TECHNICAL - 1))); SetWidgetDisabledAndInvalidate(WIDX_SPINNER_X_DECREASE, !(_tileSelected && ((_toolMap.x / 32) > 0)));
SetWidgetDisabled(WIDX_SPINNER_Y_DECREASE, !(_tileSelected && ((_toolMap.y / 32) > 0))); SetWidgetDisabledAndInvalidate(
WIDX_SPINNER_Y_INCREASE, !(_tileSelected && ((_toolMap.y / 32) < MAXIMUM_MAP_SIZE_TECHNICAL - 1)));
SetWidgetDisabledAndInvalidate(WIDX_SPINNER_Y_DECREASE, !(_tileSelected && ((_toolMap.y / 32) > 0)));
// Sort buttons // Sort buttons
SetWidgetDisabled(WIDX_BUTTON_SORT, !(_tileSelected && windowTileInspectorElementCount > 1)); SetWidgetDisabledAndInvalidate(WIDX_BUTTON_SORT, !(_tileSelected && windowTileInspectorElementCount > 1));
// Move Up button // Move Up button
SetWidgetDisabled( SetWidgetDisabledAndInvalidate(
WIDX_BUTTON_MOVE_UP, WIDX_BUTTON_MOVE_UP,
!(windowTileInspectorSelectedIndex != -1 !(windowTileInspectorSelectedIndex != -1
&& windowTileInspectorSelectedIndex < windowTileInspectorElementCount - 1)); && windowTileInspectorSelectedIndex < windowTileInspectorElementCount - 1));
InvalidateWidget(WIDX_BUTTON_MOVE_UP);
// Move Down button // Move Down button
SetWidgetDisabled(WIDX_BUTTON_MOVE_DOWN, !(windowTileInspectorSelectedIndex > 0)); SetWidgetDisabledAndInvalidate(WIDX_BUTTON_MOVE_DOWN, !(windowTileInspectorSelectedIndex > 0));
InvalidateWidget(WIDX_BUTTON_MOVE_DOWN);
// Copy button // Copy button
SetWidgetDisabled(WIDX_BUTTON_COPY, !(windowTileInspectorSelectedIndex >= 0)); SetWidgetDisabledAndInvalidate(WIDX_BUTTON_COPY, !(windowTileInspectorSelectedIndex >= 0));
InvalidateWidget(WIDX_BUTTON_COPY);
// Paste button // Paste button
SetWidgetDisabled(WIDX_BUTTON_PASTE, !(_tileSelected && _elementCopied)); SetWidgetDisabledAndInvalidate(WIDX_BUTTON_PASTE, !(_tileSelected && _elementCopied));
InvalidateWidget(WIDX_BUTTON_PASTE);
widgets[WIDX_BACKGROUND].bottom = height - 1; widgets[WIDX_BACKGROUND].bottom = height - 1;