diff --git a/src/dusk/ui/overlay.cpp b/src/dusk/ui/overlay.cpp index 1998247337..14a1e43ab4 100644 --- a/src/dusk/ui/overlay.cpp +++ b/src/dusk/ui/overlay.cpp @@ -135,8 +135,7 @@ Overlay::Overlay(OverlayProps props) : Document("res/rml/overlay.rml"), mOption(props.option), mValueMin(props.valueMin), - mValueMax(props.valueMax), - mOpenerDocument(props.openerDocument) { + mValueMax(props.valueMax) { if (mDocument == nullptr) { return; } @@ -216,10 +215,7 @@ void Overlay::dismiss() { return; } mDismissed = true; - if (mOpenerDocument != nullptr) { - mOpenerDocument->Show(); - } - hide(); + pop_document(); } void Overlay::reset_default() { diff --git a/src/dusk/ui/overlay.hpp b/src/dusk/ui/overlay.hpp index d6a71b5e01..25579c0ad2 100644 --- a/src/dusk/ui/overlay.hpp +++ b/src/dusk/ui/overlay.hpp @@ -50,7 +50,6 @@ struct OverlayProps { Rml::String helpText; int valueMin = 0; int valueMax = 0; - Rml::ElementDocument* openerDocument = nullptr; }; class Overlay : public Document { @@ -78,7 +77,6 @@ private: GraphicsOption mOption; int mValueMin = 0; int mValueMax = 0; - Rml::ElementDocument* mOpenerDocument = nullptr; std::vector > mComponents; bool mDismissed = false; }; diff --git a/src/dusk/ui/settings.cpp b/src/dusk/ui/settings.cpp index b54f931335..4b4b840aa3 100644 --- a/src/dusk/ui/settings.cpp +++ b/src/dusk/ui/settings.cpp @@ -214,17 +214,12 @@ protected: private: void open_overlay() { - auto* openerDocument = mRoot != nullptr ? mRoot->GetOwnerDocument() : nullptr; - if (openerDocument != nullptr) { - openerDocument->Hide(); - } - auto& overlay = push_document(std::make_unique(OverlayProps{ + push_document(std::make_unique(OverlayProps{ .option = mOption, .title = mTitle, .helpText = mHelpText, .valueMin = mValueMin, .valueMax = mValueMax, - .openerDocument = openerDocument, })); }