Fix dialog global draggable checkbox not updating state when toggling…

… via tray icon (rainmeter#348)
whitequill · Jul 20, 2023 · 8930785 · 8930785
1 parent 4970a05
commit 8930785
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/Library/DialogManage.cpp b/Library/DialogManage.cpp
@@ -195,6 +195,14 @@ void DialogManage::UpdateLanguageStatus()
 	}
 }
 
+void DialogManage::UpdateGlobalDraggableCheckBox()
+{
+	if (c_Dialog && c_Dialog->m_TabSettings.IsInitialized())
+	{
+		c_Dialog->m_TabSettings.UpdateDraggableCheckBox();
+	}
+}
+
 void DialogManage::UpdateSettings()
 {
 	if (c_Dialog && c_Dialog->m_TabSettings.IsInitialized())
@@ -2462,7 +2470,7 @@ void DialogManage::TabSettings::Initialize()
 	Button_SetCheck(GetControl(Id_AutoInstallCheckBox), !GetRainmeter().GetDisableAutoUpdate());
 	EnableWindow(GetControl(Id_AutoInstallCheckBox), check);
 
-	Button_SetCheck(GetControl(Id_LockSkinsCheckBox), GetRainmeter().GetDisableDragging());
+	UpdateDraggableCheckBox();
 	Button_SetCheck(GetControl(Id_LogToFileCheckBox), GetLogger().IsLogToFile());
 	Button_SetCheck(GetControl(Id_VerboseLoggingCheckBox), GetRainmeter().GetDebug());
 
@@ -2492,6 +2500,11 @@ void DialogManage::TabSettings::UpdateLanguageStatus()
 	ShowWindow(item, GetRainmeter().GetLanguageStatus() ? SW_SHOWNOACTIVATE : SW_HIDE);
 }
 
+void DialogManage::TabSettings::UpdateDraggableCheckBox()
+{
+	Button_SetCheck(GetControl(Id_LockSkinsCheckBox), GetRainmeter().GetDisableDragging());
+}
+
 void DialogManage::TabSettings::Update()
 {
 	Initialize();

diff --git a/Library/DialogManage.h b/Library/DialogManage.h
@@ -35,6 +35,7 @@ class DialogManage : public Dialog
 	static void UpdateGameMode();
 
 	static void UpdateLanguageStatus();
+	static void UpdateGlobalDraggableCheckBox();
 
 	static void UpdateSettings();
 
@@ -212,6 +213,7 @@ class DialogManage : public Dialog
 		virtual void Initialize();
 
 		void UpdateLanguageStatus();
+		void UpdateDraggableCheckBox();
 		void Update();
 
 	protected:

diff --git a/Library/Rainmeter.cpp b/Library/Rainmeter.cpp
@@ -2147,6 +2147,7 @@ void Rainmeter::SetDisableDragging(bool dragging)
 {
 	m_DisableDragging = dragging;
 	DialogManage::UpdateSkinDraggableCheckBox();
+	DialogManage::UpdateGlobalDraggableCheckBox();
 	WritePrivateProfileString(L"Rainmeter", L"DisableDragging", dragging ? L"1" : L"0", m_IniFile.c_str());
 }