Move duplicate TriggerEvent functions to GUIUtils

Author: edo9300

gframe/event_handler.cpp

@@ -43,19 +43,6 @@
 
 namespace {
 
-inline void TriggerEvent(irr::gui::IGUIElement* target, irr::gui::EGUI_EVENT_TYPE type) {
-	irr::SEvent event;
-	event.EventType = irr::EET_GUI_EVENT;
-	event.GUIEvent.EventType = type;
-	event.GUIEvent.Caller = target;
-	ygo::mainGame->device->postEventFromUser(event);
-}
-
-inline void SetCheckbox(irr::gui::IGUICheckBox* chk, bool state) {
-	chk->setChecked(state);
-	TriggerEvent(chk, irr::gui::EGET_CHECKBOX_CHANGED);
-}
-
 #if EDOPRO_ANDROID || EDOPRO_IOS
 inline bool TransformEvent(const irr::SEvent& event, bool& stopPropagation) {
 	return porting::transformEvent(event, stopPropagation);
@@ -2208,8 +2195,8 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event, bool& stopPropagation)
 		case irr::KEY_F9: {
 			if (!event.KeyInput.PressedDown) {
 				const auto new_val = !mainGame->current_topdown;
-				SetCheckbox(mainGame->gSettings.chkTopdown, new_val);
-				SetCheckbox(mainGame->gSettings.chkKeepFieldRatio, new_val);
+				GUIUtils::SetCheckbox(mainGame->device, mainGame->gSettings.chkTopdown, new_val);
+				GUIUtils::SetCheckbox(mainGame->device, mainGame->gSettings.chkKeepFieldRatio, new_val);
 			}
 			return true;
 		}

gframe/gframe.cpp

@@ -37,23 +37,10 @@ ygo::ClientUpdater* ygo::gClientUpdater = nullptr;
 JWrapper* gJWrapper = nullptr;
 
 namespace {
-inline void TriggerEvent(irr::gui::IGUIElement* target, irr::gui::EGUI_EVENT_TYPE type) {
-	irr::SEvent event;
-	event.EventType = irr::EET_GUI_EVENT;
-	event.GUIEvent.EventType = type;
-	event.GUIEvent.Caller = target;
-	ygo::mainGame->device->postEventFromUser(event);
-}
-
-inline void SetCheckbox(irr::gui::IGUICheckBox* chk, bool state) {
-	chk->setChecked(state);
-	TriggerEvent(chk, irr::gui::EGET_CHECKBOX_CHANGED);
-}
-
 void CheckArguments(const args_t& args) {
 	if(args[LAUNCH_PARAM::MUTE].enabled) {
-		SetCheckbox(ygo::mainGame->tabSettings.chkEnableSound, false);
-		SetCheckbox(ygo::mainGame->tabSettings.chkEnableMusic, false);
+		ygo::GUIUtils::SetCheckbox(ygo::mainGame->device, ygo::mainGame->tabSettings.chkEnableSound, false);
+		ygo::GUIUtils::SetCheckbox(ygo::mainGame->device, ygo::mainGame->tabSettings.chkEnableMusic, false);
 	}
 }
 

gframe/menu_handler.cpp

@@ -89,17 +89,6 @@ static void LoadReplay() {
 		start_turn = 0;
 	ReplayMode::StartReplay(start_turn, (mainGame->chkYrp->isChecked() || replay.IsOldReplayMode()));
 }
-static inline void TriggerEvent(irr::gui::IGUIElement* target, irr::gui::EGUI_EVENT_TYPE type) {
-	irr::SEvent event;
-	event.EventType = irr::EET_GUI_EVENT;
-	event.GUIEvent.EventType = type;
-	event.GUIEvent.Caller = target;
-	ygo::mainGame->device->postEventFromUser(event);
-}
-
-static inline void ClickButton(irr::gui::IGUIElement* btn) {
-	TriggerEvent(btn, irr::gui::EGET_BUTTON_CLICKED);
-}
 bool MenuHandler::OnEvent(const irr::SEvent& event) {
 	bool stopPropagation = false;
 	if(mainGame->dField.OnCommonEvent(event, stopPropagation))
@@ -1124,15 +1113,15 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 						open_file = true;
 						open_file_name = Utils::ToPathString(to_open_file);
 						if(!mainGame->wSinglePlay->isVisible())
-							ClickButton(mainGame->btnSingleMode);
-						ClickButton(mainGame->btnLoadSinglePlay);
+							GUIUtils::ClickButton(mainGame->device, mainGame->btnSingleMode);
+						GUIUtils::ClickButton(mainGame->device, mainGame->btnLoadSinglePlay);
 						return true;
 					} else if(mainGame->coreloaded && (extension == L"yrpx" || extension == L"yrp") && !mainGame->wSinglePlay->isVisible()) {
 						open_file = true;
 						open_file_name = Utils::ToPathString(to_open_file);
 						if(!mainGame->wReplay->isVisible())
-							ClickButton(mainGame->btnReplayMode);
-						ClickButton(mainGame->btnLoadReplay);
+							GUIUtils::ClickButton(mainGame->device, mainGame->btnReplayMode);
+						GUIUtils::ClickButton(mainGame->device, mainGame->btnLoadReplay);
 						return true;
 					} else if(extension == L"pem" || extension == L"cer" || extension == L"crt") {
 						gGameConfig->override_ssl_certificate_path = BufferIO::EncodeUTF8(to_open_file);

gframe/utils_gui.cpp

@@ -409,4 +409,21 @@ std::string GUIUtils::SerializeWindowPosition(std::shared_ptr<irr::IrrlichtDevic
 #endif
 }
 
+void GUIUtils::TriggerEvent(std::shared_ptr<irr::IrrlichtDevice>& device, irr::gui::IGUIElement* target, /*irr::gui::EGUI_EVENT_TYPE*/ int type) {
+	irr::SEvent event;
+	event.EventType = irr::EET_GUI_EVENT;
+	event.GUIEvent.EventType = static_cast<irr::gui::EGUI_EVENT_TYPE>(type);
+	event.GUIEvent.Caller = target;
+	device->postEventFromUser(event);
+}
+
+void GUIUtils::ClickButton(std::shared_ptr<irr::IrrlichtDevice>& device, irr::gui::IGUIElement* btn) {
+	TriggerEvent(device, btn, irr::gui::EGET_BUTTON_CLICKED);
+}
+
+void GUIUtils::SetCheckbox(std::shared_ptr<irr::IrrlichtDevice>& device, irr::gui::IGUICheckBox* chk, bool state) {
+	chk->setChecked(state);
+	TriggerEvent(device, chk, irr::gui::EGET_CHECKBOX_CHANGED);
+}
+
 }

gframe/utils_gui.h

@@ -9,6 +9,10 @@ class IrrlichtDevice;
 namespace video {
 class IVideoDriver;
 }
+namespace gui {
+class IGUIElement;
+class IGUICheckBox;
+}
 }
 
 namespace ygo {
@@ -24,6 +28,9 @@ void ToggleFullscreen(std::shared_ptr<irr::IrrlichtDevice>& device, bool& fullsc
 void ShowErrorWindow(epro::stringview context, epro::stringview message);
 void ToggleSwapInterval(irr::video::IVideoDriver* driver, int interval);
 std::string SerializeWindowPosition(std::shared_ptr<irr::IrrlichtDevice>& device);
+void TriggerEvent(std::shared_ptr<irr::IrrlichtDevice>& device, irr::gui::IGUIElement* target, /*irr::gui::EGUI_EVENT_TYPE*/ int type);
+void ClickButton(std::shared_ptr<irr::IrrlichtDevice>& device, irr::gui::IGUIElement* btn);
+void SetCheckbox(std::shared_ptr<irr::IrrlichtDevice>& device, irr::gui::IGUICheckBox* chk, bool state);
 
 }