Merge pull request #2574 from Ginger-Automation/POMNotFoundFix

Fixed screenshot issue in Explorer, changed width of refresh button, …
Ginger-Automation · Jul 14, 2022 · 10e2712 · 10e2712
2 parents 6f598c1 + a33039b
commit 10e2712
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Ginger/Ginger/UserControlsLib/UCExplorerWindowSelection.xaml b/Ginger/Ginger/UserControlsLib/UCExplorerWindowSelection.xaml
@@ -29,7 +29,7 @@
                   HorizontalAlignment="Left" VerticalAlignment="Center" FontWeight="Bold" Foreground="{StaticResource $SelectionColor_Pink}"/>
 
         <usercontrols:ucButton Grid.Column="2" x:Name="RefreshWindowsButton" ButtonType="ImageButton" ButtonImageType="Refresh" 
-                               HorizontalAlignment="Left" VerticalAlignment="Center" ToolTip="Refresh Windows List" ButtonFontImageSize="16" />
+                               HorizontalAlignment="Left" VerticalAlignment="Center" ToolTip="Refresh Windows List" ButtonFontImageSize="16" Width="30" />
 
         <!--<GridSplitter Grid.Column="2" Width="1" Height="Auto" VerticalAlignment="Stretch" HorizontalAlignment="Right" Background="{StaticResource $BackgroundColor_LightGray}"/>-->
 

diff --git a/Ginger/GingerCore/Actions/ActLaunchJavaWSApplication.cs b/Ginger/GingerCore/Actions/ActLaunchJavaWSApplication.cs
@@ -1024,7 +1024,7 @@ private Boolean IsInstrumentationModuleLoaded(int id)
                     return false;
                 }
 
-                var processHandle = Process.Start(new ProcessStartInfo() { FileName = handleExePath, Arguments = String.Format(" -p {0} GingerAgent.jar", id), UseShellExecute = false, RedirectStandardOutput = true });
+                var processHandle = Process.Start(new ProcessStartInfo() { FileName = handleExePath, Arguments = String.Format(" -accepteula -p {0} GingerAgent.jar", id), UseShellExecute = false, RedirectStandardOutput = true });
                 string cliOut = processHandle.StandardOutput.ReadToEnd();
                 processHandle.WaitForExit();
                 processHandle.Close();

diff --git a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Selenium/SeleniumDriver.cs b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Selenium/SeleniumDriver.cs
@@ -7731,7 +7731,7 @@ async Task<ElementInfo> IVisualTestingDriver.GetElementAtPoint(long ptX, long pt
             {
                 string s_Script = "return document.elementFromPoint(arguments[0], arguments[1]);";
 
-                RemoteWebElement ele = (RemoteWebElement)((IJavaScriptExecutor)Driver).ExecuteScript(s_Script, ptX, ptY);
+                IWebElement ele = (IWebElement)((IJavaScriptExecutor)Driver).ExecuteScript(s_Script, ptX, ptY);
 
                 if (ele == null)
                 {
@@ -7789,7 +7789,7 @@ async Task<ElementInfo> IVisualTestingDriver.GetElementAtPoint(long ptX, long pt
                 parentElementLocation.X += elemInfo.X;
                 parentElementLocation.Y += elemInfo.Y;
 
-                Point p_Pos = GetElementPosition(ele);
+                Point p_Pos = GetElementPosition((RemoteWebElement)ele);
                 ptX -= p_Pos.X;
                 ptY -= p_Pos.Y;
 
@@ -7840,7 +7840,7 @@ public Point GetElementPosition(RemoteWebElement i_Elem)
                             + "} "
                             + "return new Array(X, Y);";
 
-            RemoteWebDriver i_Driver = (RemoteWebDriver)i_Elem.WrappedDriver;
+            RemoteWebDriver i_Driver = (RemoteWebDriver)((RemoteWebElement)i_Elem).WrappedDriver;
             IList<Object> i_Coord = (IList<Object>)i_Driver.ExecuteScript(s_Script);
 
             int s32_ScrollX = Convert.ToInt32(i_Coord[0]);