added quit button and confirmation prompt

src/ui/ui_config.cpp

@@ -19,6 +19,15 @@ Rml::DataModelHandle sound_options_model_handle;
 recomp::PromptContext prompt_context;
 
 namespace recomp {
+	const std::unordered_map<ButtonVariant, std::string> button_variants {
+		{ButtonVariant::Primary, "primary"},
+		{ButtonVariant::Secondary, "secondary"},
+		{ButtonVariant::Tertiary, "tertiary"},
+		{ButtonVariant::Success, "success"},
+		{ButtonVariant::Error, "error"},
+		{ButtonVariant::Warning, "warning"}
+	};
+
 	void PromptContext::close_prompt() {
 		open = false;
 		model_handle.DirtyVariable("prompt__open");
@@ -31,7 +40,10 @@ namespace recomp {
 		const std::string& cancelLabelText,
 		std::function<void()> confirmCb,
 		std::function<void()> cancelCb,
-		bool shouldFocusOnCancel
+		ButtonVariant _confirmVariant,
+		ButtonVariant _cancelVariant,
+		bool _focusOnCancel,
+		const std::string& _returnElementId
 	) {
 		open = true;
 		header = headerText;
@@ -40,7 +52,10 @@ namespace recomp {
 		cancelLabel = cancelLabelText;
 		onConfirm = confirmCb;
 		onCancel = cancelCb;
-		focusOnCancel = shouldFocusOnCancel;
+		confirmVariant = _confirmVariant;
+		cancelVariant = _cancelVariant;
+		focusOnCancel = _focusOnCancel;
+		returnElementId = _returnElementId;
 
 		model_handle.DirtyVariable("prompt__open");
 		model_handle.DirtyVariable("prompt__header");
@@ -201,7 +216,11 @@ void close_config_menu() {
 				new_options = ultramodern::get_graphics_config();
 				graphics_model_handle.DirtyAllVariables();
 				close_config_menu_impl();
-			}
+			},
+			recomp::ButtonVariant::Success,
+			recomp::ButtonVariant::Error,
+			true,
+			"config__close-menu-button"
 		);
 		return;
 	}
@@ -209,6 +228,23 @@ void close_config_menu() {
 	close_config_menu_impl();
 }
 
+void open_quit_game_prompt() {
+	prompt_context.open_prompt(
+		"Are you sure you want to quit?",
+		"Any progress since your last save will be lost.",
+		"Quit",
+		"Cancel",
+		[]() {
+			ultramodern::quit();
+		},
+		[]() {},
+		recomp::ButtonVariant::Error,
+		recomp::ButtonVariant::Tertiary,
+		true,
+		"config__quit-game-button"
+	);
+}
+
 struct ControlOptionsContext {
 	int rumble_strength = 50; // 0 to 100
 	int gyro_sensitivity = 50; // 0 to 200
@@ -344,7 +380,7 @@ public:
 			});
 		recomp::register_event(listener, "config_keydown",
 			[](const std::string& param, Rml::Event& event) {
-				if (event.GetId() == Rml::EventId::Keydown) {
+				if (!prompt_context.open && event.GetId() == Rml::EventId::Keydown) {
 					if (event.GetParameter<Rml::Input::KeyIdentifier>("key_identifier", Rml::Input::KeyIdentifier::KI_UNKNOWN) == Rml::Input::KeyIdentifier::KI_ESCAPE) {
 						close_config_menu();
 					}
@@ -362,6 +398,11 @@ public:
 				close_config_menu();
 			});
 
+		recomp::register_event(listener, "open_quit_game_prompt",
+			[](const std::string& param, Rml::Event& event) {
+				open_quit_game_prompt();
+			});
+
 		recomp::register_event(listener, "toggle_input_device",
 			[](const std::string& param, Rml::Event& event) {
 				cur_device = cur_device == recomp::InputDevice::Controller

src/ui/ui_renderer.cpp

@@ -987,7 +987,36 @@ struct UIContext {
         }
         
         void update_prompt_loop(void) {
+            static bool wasShowingPrompt = false;
+
             recomp::PromptContext *ctx = recomp::get_prompt_context();
+            if (!ctx->open && wasShowingPrompt) {
+                Rml::Element* focused = current_document->GetFocusLeafNode();
+                if (focused) focused->Blur();
+
+                bool didFocus = false;
+
+                if (ctx->returnElementId.size() > 0) {
+                    Rml::Element *retEl = current_document->GetElementById(ctx->returnElementId);
+                    if (retEl != nullptr && retEl->IsVisible()) {
+                        retEl->Focus(true);
+                        didFocus = true;
+                    }
+                }
+
+                if (!didFocus) {
+                    Rml::ElementList tabs;
+                    current_document->GetElementsByTagName(tabs, "tab");
+                    for (const auto& tab : tabs) {
+                        if (tab->IsVisible()) {
+                            tab->Focus(true);
+                            break;
+                        }
+                    }
+                }
+            }
+            wasShowingPrompt = ctx->open;
+
             if (!ctx->shouldFocus) return;
 
             Rml::Element* focused = current_document->GetFocusLeafNode();
@@ -999,6 +1028,11 @@ struct UIContext {
             targetButton->Focus(true);
 
             ctx->shouldFocus = false;
+
+            Rml::Element *confirmButton = current_document->GetElementById("prompt__confirm-button");
+            Rml::Element *cancelButton  = current_document->GetElementById("prompt__cancel-button");
+            if (confirmButton != nullptr) confirmButton->SetClassNames("button button--" + recomp::button_variants.at(ctx->confirmVariant));
+            if (cancelButton  != nullptr) cancelButton->SetClassNames( "button button--" + recomp::button_variants.at(ctx->cancelVariant));
         }
     } rml;
 };