Bug 996493 - Implement MaxTouchPoints for Windows widget. r=jimm

Brli · May 14, 2014 · c47590e · c47590e
1 parent 08b4e51
commit c47590e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
@@ -3589,6 +3589,15 @@ nsWindow::UpdateThemeGeometries(const nsTArray<ThemeGeometry>& aThemeGeometries)
   }
 }
 
+uint32_t
+nsWindow::GetMaxTouchPoints() const
+{
+  if (IsWin7OrLater()) {
+    return GetSystemMetrics(SM_MAXIMUMTOUCHES);
+  }
+  return 0;
+}
+
 /**************************************************************
  **************************************************************
  **

diff --git a/widget/windows/nsWindow.h b/widget/windows/nsWindow.h
@@ -197,6 +197,7 @@ class nsWindow : public nsWindowBase
   virtual void            EndRemoteDrawing() MOZ_OVERRIDE;
 
   virtual void            UpdateThemeGeometries(const nsTArray<ThemeGeometry>& aThemeGeometries) MOZ_OVERRIDE;
+  virtual uint32_t        GetMaxTouchPoints() const MOZ_OVERRIDE;
 
   /**
    * Event helpers

diff --git a/widget/windows/nsWindowDefs.h b/widget/windows/nsWindowDefs.h
@@ -45,6 +45,11 @@
 #define SM_CXPADDEDBORDER                 92
 #endif
 
+// require WINVER >= 0x601
+#ifndef SM_MAXIMUMTOUCHES
+#define SM_MAXIMUMTOUCHES                 95
+#endif
+
 #ifndef WM_THEMECHANGED
 #define WM_THEMECHANGED                   0x031A
 #endif