uia 0.0.9 → 0.1

data/ChangeLog

@@ -1,3 +1,8 @@
+=== Verions 0.1 / 2013-02-06
+*   Enhancements
+    *   changed #click to be clickable point only
+    *   added #click_center to try to click in the bounding_rectangle
+
 ===	Version 0.0.9 / 2014-02-06
 *	Enhancements
 	*	Element#focused? and Element#focus

data/ext/UiaDll/UIA.Helper/Clicker.cs

@@ -21,18 +21,27 @@ namespace UIA.Helper
         private const uint MOUSEEVENTLF_LEFTDOWN = 0x2;
         private const uint MOUSEEVENTLF_LEFTUP = 0x4;
 
-        public static void MouseClick(AutomationElement element)
+        public static void ClickClickablePoint(AutomationElement element)
+        {
+            Click(element, element.GetClickablePoint());
+        }
+
+        public static void ClickCenter(AutomationElement element)
+        {
+            Click(element, Center(element));
+        }
+
+        private static void Click(AutomationElement element, Point point)
         {
             element.ScrollToIfPossible();
             element.TryToFocus();
 
-            var clickablePoint = ClickablePoint(element);
-            Cursor.Position = new System.Drawing.Point((int)clickablePoint.X, (int)clickablePoint.Y);
+            Cursor.Position = new System.Drawing.Point((int) point.X, (int) point.Y);
             mouse_event(MOUSEEVENTLF_LEFTDOWN, 0, 0, 0, 0);
             mouse_event(MOUSEEVENTLF_LEFTUP, 0, 0, 0, 0);
         }
 
-        private static Point ClickablePoint(AutomationElement element)
+        private static Point Center(AutomationElement element)
         {
             try
             {

data/ext/UiaDll/UIA.Helper/Element.cs

@@ -112,9 +112,14 @@ namespace UIA.Helper
             get { return Find(TreeScope.Descendants, Condition.TrueCondition); }
         }
 
-        public void MouseClick()
+        public void ClickClickablePoint()
         {
-            Clicker.MouseClick(_element);
+            Clicker.ClickClickablePoint(_element);
+        }
+
+        public void ClickCenter()
+        {
+            Clicker.ClickCenter(_element);
         }
 
         public static Element From(AutomationElement element)

data/ext/UiaDll/UiaDll/ElementMethods.cpp

@@ -136,9 +136,17 @@ extern "C" {
     }
   }
 
-  __declspec(dllexport) void Element_Click(ElementInformationPtr element, char* errorInfo, const int errorLength) {
+  __declspec(dllexport) void Element_ClickClickablePoint(ElementInformationPtr element, char* errorInfo, const int errorLength) {
     try {
-      Find(element)->MouseClick();
+      Find(element)->ClickClickablePoint();
+    } catch(Exception^ error) {
+      StringHelper::CopyToUnmanagedString(error->Message, errorInfo, errorLength);
+    }
+  }
+
+  __declspec(dllexport) void Element_ClickCenter(ElementInformationPtr element, char* errorInfo, const int errorLength) {
+    try {
+      Find(element)->ClickCenter();
     } catch(Exception^ error) {
       StringHelper::CopyToUnmanagedString(error->Message, errorInfo, errorLength);
     }

data/lib/uia/element.rb

@@ -68,6 +68,11 @@ module Uia
       true
     end
 
+    def click_center
+      Library.click_center(@element)
+      true
+    end
+
     def focus
       Library.focus(@element)
     end

data/lib/uia/library.rb

@@ -70,7 +70,8 @@ module Uia
     attach_throwable_function :find_child_by_name, :Element_FindChildByName, [:pointer, :string, :string], ManagedElementStruct.by_ref, &element_or_nil
     elements_from :children, :Element_Children, [:pointer]
     elements_from :descendants, :Element_Descendants, [:pointer]
-    attach_throwable_function :click, :Element_Click, [:pointer], :void
+    attach_throwable_function :click, :Element_ClickClickablePoint, [:pointer], :void
+    attach_throwable_function :click_center, :Element_ClickCenter, [:pointer], :void
     attach_throwable_function :focus, :Element_Focus, [:pointer], :void
     attach_throwable_function :refresh, :Element_Refresh, [:pointer], :void
 

data/lib/uia/version.rb

@@ -1,3 +1,3 @@
 module Uia
-  VERSION = '0.0.9'
+  VERSION = '0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uia
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: '0.1'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -249,7 +249,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -154468511
+      hash: 258330671
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -258,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -154468511
+      hash: 258330671
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24