mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-21 11:22:45 +01:00
Code Issues Releases Wiki Activity

Fix #14916: Duration of error message window could be too short. (#14919)

Browse Source 
The timer for automatically closing the error message was started when creating the window, instead of when first displaying the window.
This commit is contained in:
Peter Nelson
2025-12-15 16:42:36 +00:00
committed by GitHub
parent f6eba87e47
commit 447959b214
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/error_gui.cpp
View File

@@ -101,22 +101,17 @@ private:
uint height_summary = 0; ///< Height of the #summary_msg string in pixels in the #WID_EM_MESSAGE widget.
uint height_detailed = 0; ///< Height of the #detailed_msg string in pixels in the #WID_EM_MESSAGE widget.
uint height_extra = 0; ///< Height of the #extra_msg string in pixels in the #WID_EM_MESSAGE widget.
TimeoutTimer<TimerWindow> display_timeout;
TimeoutTimer<TimerWindow> display_timeout = {std::chrono::seconds(_settings_client.gui.errmsg_duration), [this]() {
this->Close();
}};
public:
ErrmsgWindow(const ErrorMessageData &data) :
Window(data.HasFace() ? _errmsg_face_desc : _errmsg_desc),
ErrorMessageData(data),
display_timeout(std::chrono::seconds(_settings_client.gui.errmsg_duration), [this]() {
this->Close();
})
ErrorMessageData(data)
{
this->InitNested();
/* Only start the timeout if the message is not critical. */
if (!this->is_critical) {
this->display_timeout.Reset();
}
}
void UpdateWidgetSize(WidgetID widget, Dimension &size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension &fill, [[maybe_unused]] Dimension &resize) override
@@ -222,6 +217,17 @@ public:
}
}
void OnPaint() override
{
/* Start the timeout if not already started and the message is not critical. This is handled during OnPaint so that any delay between
* creating the window and displaying it does not affect how long the message is visible. */
if (!this->is_critical && this->display_timeout.HasFired()) {
this->display_timeout.Reset();
}
this->Window::OnPaint();
}
void OnMouseLoop() override
{
/* Disallow closing the window too easily, if timeout is disabled */