优化鼠标手势

libiao7 · Apr 6, 2016 · 4b1a6a6 · 4b1a6a6
1 parent ef644f1
commit 4b1a6a6
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/src/TabBookmark.h b/src/TabBookmark.h
@@ -229,17 +229,19 @@ IAccessible* FindChildElement(IAccessible *parent, long role)
     IAccessible* element = NULL;
     if (parent)
     {
-        int i = 1;
-        TraversalAccessible(parent, [&element, &i, &role]
+        TraversalAccessible(parent, [&element, &role]
         (IAccessible* child) {
             if (CheckAccessibleRole(child, role))
             {
                 element = child;
             }
-            i++;
             return element != NULL;
         });
     }
+    if (parent && !element)
+    {
+        DebugLog(L"FindChildElement %X failed", role);
+    }
     return element;
 }
 
@@ -259,11 +261,12 @@ IAccessible* FindTopContainerView(IAccessible *top)
     {
         if(GetAccessibleRole(BookMark)==ROLE_SYSTEM_TOOLBAR)
         {
-            top = GetChildElement(top, true, 3);
             BookMark->Release();
+            top = GetChildElement(top, true, 3);
         }
         else
         {
+            top->Release();
             top = BookMark;
         }
 
@@ -288,6 +291,10 @@ IAccessible* GetTopContainerView(HWND hwnd)
         if ( S_OK == AccessibleObjectFromWindow(hwnd, OBJID_WINDOW, IID_IAccessible, (void**)&paccMainWindow) )
         {
             TopContainerView = FindTopContainerView(paccMainWindow);
+            if (!TopContainerView)
+            {
+                DebugLog(L"FindTopContainerView failed");
+            }
         }
     }
     return TopContainerView;
@@ -545,6 +552,7 @@ LRESULT CALLBACK MouseProc(int nCode, WPARAM wParam, LPARAM lParam)
         if(wParam==WM_RBUTTONUP && wheel_tab_ing)
         {
             wheel_tab_ing = false;
+            gesture_mgr.OnRButtonUp(pmouse);
             return 1;
         }
 

diff --git a/src/gesture/GestureWindow.h b/src/gesture/GestureWindow.h
@@ -48,7 +48,7 @@ class GestureWindow :
         if(!image_up) return;
 
         RECT rect;
-        ::GetWindowRect(GetTopWnd(main_hwnd), &rect);
+        ::GetWindowRect(main_hwnd, &rect);
 
         int width = rect.right - rect.left;
         int height = rect.bottom - rect.top;
@@ -126,14 +126,14 @@ class GestureWindow :
 
     LRESULT OnUserHwnd(UINT /*uMsg*/, WPARAM wParam, LPARAM /*lParam*/, BOOL& /*bHandled*/)
     {
-        main_hwnd = (HWND)wParam;
+        main_hwnd = GetTopWnd((HWND)wParam);
         return 0;
     }
 
     LRESULT OnUserShow(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
     {
         RECT rect;
-        ::GetWindowRect(GetTopWnd(main_hwnd), &rect);
+        ::GetWindowRect(main_hwnd, &rect);
         ::SetWindowPos(m_hWnd, NULL, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, SWP_NOACTIVATE | SWP_NOZORDER);
 
         DoUpdateWindow();
@@ -157,11 +157,17 @@ class GestureWindow :
         std::wstring action = GetAction(command);
         if (action.empty()) return 0;
 
-        SendKey(action);
+        std::thread th(DelaySendkeys, action);
+        th.detach();
         return 0;
     }
 
 private:
+    static void DelaySendkeys(std::wstring action)
+    {
+        Sleep(50);
+        SendKey(action);
+    }
     HWND GetTopWnd(HWND hwnd)
     {
         while (::GetParent(hwnd) && ::IsWindowVisible(::GetParent(hwnd)))