22// (context when a running test + end user automation API)
33// This is the main (if not only) interface that your Tests will be using.
44
5- // This file is governed by the "Dear ImGui Test Engine License".
6- // Details of the license are provided in the LICENSE.txt file in the same directory.
7-
85#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
96#define _CRT_SECURE_NO_WARNINGS
107#endif
@@ -1625,13 +1622,7 @@ void ImGuiTestContext::_MakeAimingSpaceOverPos(ImGuiViewport* viewport, ImGuiWin
16251622 LogDebug (" _MakeAimingSpaceOverPos(over_window = '%s', over_pos = %.2f,%.2f)" , over_window ? over_window->Name : " N/A" , over_pos.x , over_pos.y );
16261623
16271624 const int over_window_n = (over_window != nullptr ) ? ImGui::FindWindowDisplayIndex (over_window) : -1 ;
1628- #if IMGUI_VERSION_NUM < 19183
1629- const ImVec2 hover_padding = g.WindowsHoverPadding ;
1630- #else
1631- const ImVec2 hover_padding = ImVec2 (g.WindowsBorderHoverPadding , g.WindowsBorderHoverPadding );
1632- #endif
1633-
1634- const ImVec2 window_min_pos = over_pos + hover_padding + ImVec2 (1 .0f , 1 .0f );
1625+ const ImVec2 window_min_pos = over_pos + g.WindowsHoverPadding + ImVec2 (1 .0f , 1 .0f );
16351626 for (int window_n = g.Windows .Size - 1 ; window_n > over_window_n; window_n--)
16361627 {
16371628 ImGuiWindow* window = g.Windows [window_n];
@@ -1741,16 +1732,11 @@ void ImGuiTestContext::MouseMove(ImGuiTestRef ref, ImGuiTestOpFlags flags)
17411732
17421733 // Check visibility and scroll if necessary
17431734 {
1744- #if IMGUI_VERSION_NUM < 19183
1745- const ImVec2 hover_padding = g.WindowsHoverPadding ;
1746- #else
1747- const ImVec2 hover_padding = ImVec2 (g.WindowsBorderHoverPadding , g.WindowsBorderHoverPadding );
1748- #endif
17491735 if (item.NavLayer == ImGuiNavLayer_Main)
17501736 {
17511737 float min_visible_size = 10 .0f ;
1752- float min_window_size_x = window->DecoInnerSizeX1 + window->DecoOuterSizeX1 + window->DecoOuterSizeX2 + min_visible_size + hover_padding .x * 2 .0f ;
1753- float min_window_size_y = window->DecoInnerSizeY1 + window->DecoOuterSizeY1 + window->DecoOuterSizeY2 + min_visible_size + hover_padding .y * 2 .0f ;
1738+ float min_window_size_x = window->DecoInnerSizeX1 + window->DecoOuterSizeX1 + window->DecoOuterSizeX2 + min_visible_size + g. WindowsHoverPadding .x * 2 .0f ;
1739+ float min_window_size_y = window->DecoInnerSizeY1 + window->DecoOuterSizeY1 + window->DecoOuterSizeY2 + min_visible_size + g. WindowsHoverPadding .y * 2 .0f ;
17541740 if ((window->Size .x < min_window_size_x || window->Size .y < min_window_size_y) && (window->Flags & ImGuiWindowFlags_NoResize) == 0 && (window->Flags & ImGuiWindowFlags_AlwaysAutoResize) == 0 )
17551741 {
17561742 LogDebug (" MouseMove: Will attempt to resize window to make item in main scrolling layer visible." );
@@ -1763,7 +1749,7 @@ void ImGuiTestContext::MouseMove(ImGuiTestRef ref, ImGuiTestOpFlags flags)
17631749 }
17641750
17651751 ImRect window_r = window->InnerClipRect ;
1766- window_r.Expand (ImVec2 (-hover_padding. x , -hover_padding .y ));
1752+ window_r.Expand (ImVec2 (-g. WindowsHoverPadding . x , -g. WindowsHoverPadding .y ));
17671753
17681754 ImRect item_r_clipped;
17691755 item_r_clipped.Min .x = ImClamp (item.RectFull .Min .x , window_r.Min .x , window_r.Max .x );
@@ -1876,11 +1862,7 @@ void ImGuiTestContext::MouseMove(ImGuiTestRef ref, ImGuiTestOpFlags flags)
18761862 if (is_hovering_resize_corner)
18771863 {
18781864 LogDebug (" MouseMove: Child obstructed by parent's ResizeGrip, trying to resize window and trying again.." );
1879- #if IMGUI_VERSION_NUM < 19172
18801865 float extra_size = window->CalcFontSize () * 3 .0f ;
1881- #else
1882- float extra_size = window->FontRefSize * 3 .0f ;
1883- #endif
18841866 WindowResize (window->ID , window->Size + ImVec2 (extra_size, extra_size));
18851867 MouseMove (ref, flags | ImGuiTestOpFlags_IsSecondAttempt);
18861868 return ;
@@ -2003,19 +1985,14 @@ void ImGuiTestContext::_ForeignWindowsHideOverPos(const ImVec2& pos, ImGuiWindow
20031985 for (int i = 0 ; ignore_list[i]; i++)
20041986 min_window_index = ImMin (min_window_index, ImGui::FindWindowDisplayIndex (ignore_list[i]));
20051987
2006- #if IMGUI_VERSION_NUM < 19183
2007- const ImVec2 hover_padding = g.WindowsHoverPadding ;
2008- #else
2009- const ImVec2 hover_padding = ImVec2 (g.WindowsBorderHoverPadding , g.WindowsBorderHoverPadding );
2010- #endif
20111988 bool hidden_windows = false ;
20121989 for (int i = 0 ; i < g.Windows .Size ; i++)
20131990 {
20141991 ImGuiWindow* other_window = g.Windows [i];
20151992 if (other_window->RootWindow == other_window && other_window->WasActive )
20161993 {
20171994 ImRect r = other_window->Rect ();
2018- r.Expand (hover_padding );
1995+ r.Expand (g. WindowsHoverPadding );
20191996 if (r.Contains (pos))
20201997 {
20211998 for (int j = 0 ; ignore_list[j]; j++)
@@ -2316,11 +2293,6 @@ ImGuiWindow* ImGuiTestContext::FindHoveredWindowAtPos(const ImVec2& pos)
23162293
23172294static bool IsPosOnVoid (ImGuiContext& g, const ImVec2& pos)
23182295{
2319- #if IMGUI_VERSION_NUM < 19183
2320- const ImVec2 hover_padding = g.WindowsHoverPadding ;
2321- #else
2322- const ImVec2 hover_padding = ImVec2 (g.WindowsBorderHoverPadding , g.WindowsBorderHoverPadding );
2323- #endif
23242296 for (ImGuiWindow* window : g.Windows )
23252297#ifdef IMGUI_HAS_DOCK
23262298 if (window->RootWindowDockTree == window && window->WasActive )
@@ -2329,7 +2301,7 @@ static bool IsPosOnVoid(ImGuiContext& g, const ImVec2& pos)
23292301#endif
23302302 {
23312303 ImRect r = window->Rect ();
2332- r.Expand (hover_padding );
2304+ r.Expand (g. WindowsHoverPadding );
23332305 if (r.Contains (pos))
23342306 return false ;
23352307 }
@@ -3525,11 +3497,7 @@ void ImGuiTestContext::MenuAction(ImGuiTestAction action, ImGuiTestRef ref)
35253497 ItemAction (Inputs->MouseButtonsValue ? ImGuiTestAction_Hover : ImGuiTestAction_Click, buf.c_str ());
35263498 }
35273499 }
3528- #if IMGUI_VERSION_NUM < 19187
35293500 current_window = GetWindowByRef (Str16f (" //##Menu_%02d" , depth).c_str ());
3530- #else
3531- current_window = GetWindowByRef (Str16f (" //###Menu_%02d" , depth).c_str ());
3532- #endif
35333501 IM_CHECK_SILENT (current_window != nullptr );
35343502
35353503 path = p + 1 ;
0 commit comments