From 1e222c1712e60244624c4725abb823acdbd6a625 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 25 Apr 2024 14:42:04 +0300
Subject: minor code cleaning

---
 plugins/TabSRMM/res/resource.rc    |  2 +-
 plugins/TabSRMM/src/msgoptions.cpp | 28 ++++++++++++++--------------
 plugins/TabSRMM/src/themes.cpp     |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'plugins')

diff --git a/plugins/TabSRMM/res/resource.rc b/plugins/TabSRMM/res/resource.rc
index b653832a24..f873a65e0b 100644
--- a/plugins/TabSRMM/res/resource.rc
+++ b/plugins/TabSRMM/res/resource.rc
@@ -359,7 +359,7 @@ BEGIN
     GROUPBOX        "Windows Aero settings",IDC_STATIC,4,140,294,42
     CONTROL         "Use Aero UI elements (only when not using a custom skin)",IDC_USEAERO,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,150,284,11
-    COMBOBOX        IDC_AEROEFFECT,8,165,194,36,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_AEROEFFECT,8,165,194,36,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Use Windows 7 task bar enhancements (restart required)",IDC_USEAEROPEEK,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,185,284,11
 END
diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index c9d72a823d..e1e8f5bec1 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -1136,16 +1136,6 @@ class COptContainersDlg : public CDlgBase
 	CCtrlCheck chkUseAero, chkUseAeroPeek, chkLimits, chkSingle, chkGroup, chkDefault;
 	CCtrlHyperlink urlHelp;
 
-	void onChangeAero(CCtrlCheck*)
-	{
-		Utils::enableDlgControl(m_hwnd, IDC_AEROEFFECT, chkUseAero.GetState() != 0);
-	}
-
-	void onChangeLimits(CCtrlCheck*)
-	{
-		Utils::enableDlgControl(m_hwnd, IDC_TABLIMIT, chkLimits.GetState() != 0);
-	}
-
 public:
 	COptContainersDlg()
 		: CDlgBase(g_plugin, IDD_OPT_CONTAINERS),
@@ -1161,8 +1151,8 @@ public:
 		chkGroup(this, IDC_CONTAINERGROUPMODE),
 		chkDefault(this, IDC_DEFAULTCONTAINERMODE)
 	{
-		chkUseAero.OnChange = Callback(this, &COptContainersDlg::onChangeAero);
-		chkLimits.OnChange = chkSingle.OnChange = chkGroup.OnChange = chkDefault.OnChange = Callback(this, &COptContainersDlg::onChangeLimits);
+		chkUseAero.OnChange = Callback(this, &COptContainersDlg::onChange_Aero);
+		chkLimits.OnChange = chkSingle.OnChange = chkGroup.OnChange = chkDefault.OnChange = Callback(this, &COptContainersDlg::onChange_Limits);
 	}
 
 	bool OnInitDialog() override
@@ -1171,7 +1161,7 @@ public:
 		chkLimits.SetState(M.GetByte("limittabs", 0));
 
 		spnTabLimit.SetPosition(M.GetDword("maxtabs", 1));
-		onChangeLimits(nullptr);
+		onChange_Limits(0);
 
 		chkSingle.SetState(M.GetByte("singlewinmode", 0));
 		chkDefault.SetState(!(chkGroup.GetState() || chkLimits.GetState() || chkSingle.GetState()));
@@ -1183,7 +1173,7 @@ public:
 		chkUseAeroPeek.SetState(M.GetByte("useAeroPeek", 1));
 
 		for (int i = 0; i < CSkin::AERO_EFFECT_LAST; i++)
-			cmbAeroEffect.InsertString(TranslateW(CSkin::m_aeroEffects[i].tszName), -1);
+			cmbAeroEffect.AddString(TranslateW(CSkin::m_aeroEffects[i].tszName));
 		cmbAeroEffect.SetCurSel(CSkin::m_aeroEffect);
 		cmbAeroEffect.Enable(IsWinVerVistaPlus());
 
@@ -1215,6 +1205,16 @@ public:
 		BuildContainerMenu();
 		return true;
 	}
+
+	void onChange_Aero(CCtrlCheck *)
+	{
+		cmbAeroEffect.Enable(chkUseAero.IsChecked());
+	}
+
+	void onChange_Limits(CCtrlCheck *)
+	{
+		Utils::enableDlgControl(m_hwnd, IDC_TABLIMIT, chkLimits.IsChecked());
+	}
 };
 
 /////////////////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/TabSRMM/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp
index f93f20c4e7..007f675098 100644
--- a/plugins/TabSRMM/src/themes.cpp
+++ b/plugins/TabSRMM/src/themes.cpp
@@ -2310,8 +2310,8 @@ void CSkin::AeroEffectCallback_Carbon(const HDC hdc, const RECT *rc, int iEffect
 {
 	if (iEffectArea < 0x1000)
 		DrawAlpha(hdc, const_cast<RECT *>(rc), m_pCurrentAeroEffect->m_baseColor, m_pCurrentAeroEffect->m_baseAlpha,
-		m_pCurrentAeroEffect->m_gradientColor, 0, m_pCurrentAeroEffect->m_gradientType,
-		m_pCurrentAeroEffect->m_cornerType, m_pCurrentAeroEffect->m_cornerRadius, nullptr);
+			m_pCurrentAeroEffect->m_gradientColor, 0, m_pCurrentAeroEffect->m_gradientType,
+			m_pCurrentAeroEffect->m_cornerType, m_pCurrentAeroEffect->m_cornerRadius, nullptr);
 }
 
 void CSkin::AeroEffectCallback_Solid(const HDC hdc, const RECT *rc, int iEffectArea)
-- 
cgit v1.2.3