summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Nelson <peter1138@openttd.org>2021-05-06 01:36:56 +0100
committerPeterN <peter@fuzzle.org>2021-05-08 09:52:54 +0100
commit8321ef0061fa898cfb215e57c67aebd7411475e1 (patch)
tree0ba37807c70fe118e7d44d9e73a208fb8f9dcbc2 /src
parente2774354b4f64a46992a74b399fb882aa075cfac (diff)
downloadopenttd-8321ef0061fa898cfb215e57c67aebd7411475e1.tar.xz
Codechange: Set specific widgets dirty instead of window.
Diffstat (limited to 'src')
-rw-r--r--src/misc_gui.cpp2
-rw-r--r--src/music_gui.cpp2
-rw-r--r--src/settings_gui.cpp9
-rw-r--r--src/window.cpp2
4 files changed, 8 insertions, 7 deletions
diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
index e9ee7b193..a40bf5013 100644
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -557,7 +557,7 @@ struct AboutWindow : public Window {
if (this->text_position < (int)(this->GetWidget<NWidgetBase>(WID_A_SCROLLING_TEXT)->pos_y - lengthof(_credits) * this->line_height)) {
this->text_position = this->GetWidget<NWidgetBase>(WID_A_SCROLLING_TEXT)->pos_y + this->GetWidget<NWidgetBase>(WID_A_SCROLLING_TEXT)->current_y;
}
- this->SetDirty();
+ this->SetWidgetDirty(WID_A_SCROLLING_TEXT);
}
}
};
diff --git a/src/music_gui.cpp b/src/music_gui.cpp
index 16245a0b2..80d55eb4b 100644
--- a/src/music_gui.cpp
+++ b/src/music_gui.cpp
@@ -789,7 +789,7 @@ struct MusicWindow : public Window {
byte &vol = (widget == WID_M_MUSIC_VOL) ? _settings_client.music.music_vol : _settings_client.music.effect_vol;
if (ClickVolumeSliderWidget(this->GetWidget<NWidgetBase>(widget)->GetCurrentRect(), pt, vol)) {
if (widget == WID_M_MUSIC_VOL) MusicDriver::GetInstance()->SetVolume(vol);
- this->SetDirty();
+ this->SetWidgetDirty(widget);
SetWindowClassesDirty(WC_GAME_OPTIONS);
}
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index 9935d596c..15c6a887e 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -446,17 +446,18 @@ struct GameOptionsWindow : Window {
ShowErrorMessage(STR_ERROR_FULLSCREEN_FAILED, INVALID_STRING_ID, WL_ERROR);
}
this->SetWidgetLoweredState(WID_GO_FULLSCREEN_BUTTON, _fullscreen);
- this->SetDirty();
+ this->SetWidgetDirty(WID_GO_FULLSCREEN_BUTTON);
break;
case WID_GO_VIDEO_ACCEL_BUTTON:
_video_hw_accel = !_video_hw_accel;
ShowErrorMessage(STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART, INVALID_STRING_ID, WL_INFO);
this->SetWidgetLoweredState(WID_GO_VIDEO_ACCEL_BUTTON, _video_hw_accel);
+ this->SetWidgetDirty(WID_GO_VIDEO_ACCEL_BUTTON);
#ifndef __APPLE__
this->SetWidgetDisabledState(WID_GO_VIDEO_VSYNC_BUTTON, !_video_hw_accel);
+ this->SetWidgetDirty(WID_GO_VIDEO_VSYNC_BUTTON);
#endif
- this->SetDirty();
break;
case WID_GO_VIDEO_VSYNC_BUTTON:
@@ -466,7 +467,7 @@ struct GameOptionsWindow : Window {
VideoDriver::GetInstance()->ToggleVsync(_video_vsync);
this->SetWidgetLoweredState(WID_GO_VIDEO_VSYNC_BUTTON, _video_vsync);
- this->SetDirty();
+ this->SetWidgetDirty(WID_GO_VIDEO_VSYNC_BUTTON);
break;
case WID_GO_BASE_SFX_VOLUME:
@@ -474,7 +475,7 @@ struct GameOptionsWindow : Window {
byte &vol = (widget == WID_GO_BASE_MUSIC_VOLUME) ? _settings_client.music.music_vol : _settings_client.music.effect_vol;
if (ClickVolumeSliderWidget(this->GetWidget<NWidgetBase>(widget)->GetCurrentRect(), pt, vol)) {
if (widget == WID_GO_BASE_MUSIC_VOLUME) MusicDriver::GetInstance()->SetVolume(vol);
- this->SetDirty();
+ this->SetWidgetDirty(widget);
SetWindowClassesDirty(WC_MUSIC_WINDOW);
}
diff --git a/src/window.cpp b/src/window.cpp
index a40972600..20c7ffbdd 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -2438,8 +2438,8 @@ static EventState HandleActiveWidget()
if (w->mouse_capture_widget >= 0) {
/* Abort if no button is clicked any more. */
if (!_left_button_down) {
+ w->SetWidgetDirty(w->mouse_capture_widget);
w->mouse_capture_widget = -1;
- w->SetDirty();
return ES_HANDLED;
}