22.2.11 Some fix

tablacus · Feb 11, 2022 · ca70f9c · ca70f9c
1 parent bf237a2
commit ca70f9c
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 12 deletions.
diff --git a/Debug/addons/tabplus/config.xml b/Debug/addons/tabplus/config.xml
@@ -1,8 +1,8 @@
 <TablacusExplorer>
   <General>
-    <Version>1.91</Version>
+    <Version>1.92</Version>
     <MinVersion>2022.1.16</MinVersion>
-    <pubDate>Tue, 18 Jan 2022 00:00:00 GMT</pubDate>
+    <pubDate>Fri, 11 Feb 2022 00:00:00 GMT</pubDate>
     <Options>Common:0:0</Options>
     <Level>2</Level>
     <Creator>Gaku</Creator>

diff --git a/Debug/addons/tabplus/script.js b/Debug/addons/tabplus/script.js
@@ -166,7 +166,7 @@ if (window.Addon == 1) {
 				s.push('<td class="namecell" style="vertical-align: middle;"><div style="overflow: hidden; white-space: nowrap;');
 				const bUseClose = Addons.TabPlus.opt.Close && r[4] == S_OK;
 				if (bUseClose && Addons.TabPlus.opt.Align > 1 && Addons.TabPlus.opt.Width) {
-					w -= r0;
+					w -= r0 * ui_.Zoom;
 				}
 				w += Addons.TabPlus.opt.Width;
 				if (w > 0) {

diff --git a/Debug/lib/te32.dll b/Debug/lib/te32.dll
diff --git a/Debug/lib/te64.dll b/Debug/lib/te64.dll
diff --git a/Debug/script/sync.js b/Debug/script/sync.js
@@ -57,7 +57,7 @@ g_.updateJSONURL = "https://api.github.com/repos/tablacus/TablacusExplorer/relea
 
 AboutTE = function (n) {
 	if (n == 0) {
-		return te.Version < 20220209 ? te.Version : 20220210;
+		return te.Version < 20220211 ? te.Version : 20220211;
 	}
 	if (n == 1) {
 		const v = AboutTE(0);

diff --git a/TE/Resource.h b/TE/Resource.h
@@ -16,7 +16,7 @@
 //Version(DLL)
 #define VER_Y		22
 #define VER_M		2
-#define VER_D		9
+#define VER_D		11
 #endif
 
 //Icon

diff --git a/TE/TE.cpp b/TE/TE.cpp
@@ -2376,18 +2376,21 @@ LRESULT CALLBACK MouseProc(int nCode, WPARAM wParam, LPARAM lParam)
 									msg.wParam = pMHS->mouseData;
 									msg.pt.x = pMHS->pt.x;
 									msg.pt.y = pMHS->pt.y;
-									CHAR szClassA[MAX_CLASS_NAME];
-									GetClassNameA(msg.hwnd, szClassA, MAX_CLASS_NAME);
-									if (lstrcmpA(szClassA, WC_LISTVIEWA) == 0) {
+									CHAR pszClassA[MAX_CLASS_NAME];
+									GetClassNameA(msg.hwnd, pszClassA, MAX_CLASS_NAME);
+									if (lstrcmpA(pszClassA, WC_LISTVIEWA) == 0) {
 										if (msg.message == WM_LBUTTONDOWN) {
 											msg.hwnd = WindowFromPoint(pMHS->pt);
 										}
-									} else if (lstrcmpA(szClassA, "DirectUIHWND") == 0) {
+									} else if (lstrcmpA(pszClassA, "DirectUIHWND") == 0) {
 										if (msg.message == WM_LBUTTONDOWN) {
 											if (GetTickCount() - g_dwDoubleTime < GetDoubleClickTime() &&
-												abs(g_ptDouble.x - msg.pt.x) < GetSystemMetrics(SM_CXDRAG) &&
-												abs(g_ptDouble.y - msg.pt.y) < GetSystemMetrics(SM_CXDRAG)) {
-												msg.message = WM_LBUTTONDBLCLK;
+												abs(g_ptDouble.x - msg.pt.x) <= GetSystemMetrics(SM_CXDRAG) &&
+												abs(g_ptDouble.y - msg.pt.y) <= GetSystemMetrics(SM_CYDRAG)) {
+												CteShellBrowser *pSB = SBfromhwnd(msg.hwnd);
+												if (pSB && pSB->GetFolderViewAndItemCount(NULL, SVGIO_SELECTION) == 0) {
+													msg.message = WM_LBUTTONDBLCLK;
+												}
 											} else {
 												g_ptDouble.x = msg.pt.x;
 												g_ptDouble.y = msg.pt.y;