Browse Source

Removed custom patch from imgui

Rokas Kupstys 8 years ago
parent
commit
455ac12273
2 changed files with 0 additions and 11 deletions
  1. 0 8
      Source/ThirdParty/imgui/imgui.cpp
  2. 0 3
      Source/ThirdParty/imgui/imgui.h

+ 0 - 8
Source/ThirdParty/imgui/imgui.cpp

@@ -3138,14 +3138,6 @@ bool ImGui::IsMouseHoveringAnyWindow()
     return g.HoveredWindow != NULL;
     return g.HoveredWindow != NULL;
 }
 }
 
 
-// ATOMIC BEGIN
-bool ImGui::IsAnyWindowFocused()
-{
-    ImGuiContext& g = *GImGui;
-    return g.FocusedWindow != 0;
-}
-// ATOMIC END
-
 bool ImGui::IsPosHoveringAnyWindow(const ImVec2& pos)
 bool ImGui::IsPosHoveringAnyWindow(const ImVec2& pos)
 {
 {
     return FindHoveredWindow(pos, false) != NULL;
     return FindHoveredWindow(pos, false) != NULL;

+ 0 - 3
Source/ThirdParty/imgui/imgui.h

@@ -437,9 +437,6 @@ namespace ImGui
     IMGUI_API bool          IsMouseReleased(int button);                                        // did mouse button released (went from Down to !Down)
     IMGUI_API bool          IsMouseReleased(int button);                                        // did mouse button released (went from Down to !Down)
     IMGUI_API bool          IsMouseHoveringWindow();                                            // is mouse hovering current window ("window" in API names always refer to current window). disregarding of any consideration of being blocked by a popup. (unlike IsWindowHovered() this will return true even if the window is blocked because of a popup)
     IMGUI_API bool          IsMouseHoveringWindow();                                            // is mouse hovering current window ("window" in API names always refer to current window). disregarding of any consideration of being blocked by a popup. (unlike IsWindowHovered() this will return true even if the window is blocked because of a popup)
     IMGUI_API bool          IsMouseHoveringAnyWindow();                                         // is mouse hovering any visible window
     IMGUI_API bool          IsMouseHoveringAnyWindow();                                         // is mouse hovering any visible window
-// ATOMIC BEGIN
-    IMGUI_API bool          IsAnyWindowFocused();                                               // is any window (visible or not) focused
-// ATOMIC END
     IMGUI_API bool          IsMouseHoveringRect(const ImVec2& r_min, const ImVec2& r_max, bool clip = true);  // is mouse hovering given bounding rect (in screen space). clipped by current clipping settings. disregarding of consideration of focus/window ordering/blocked by a popup.
     IMGUI_API bool          IsMouseHoveringRect(const ImVec2& r_min, const ImVec2& r_max, bool clip = true);  // is mouse hovering given bounding rect (in screen space). clipped by current clipping settings. disregarding of consideration of focus/window ordering/blocked by a popup.
     IMGUI_API bool          IsMouseDragging(int button = 0, float lock_threshold = -1.0f);      // is mouse dragging. if lock_threshold < -1.0f uses io.MouseDraggingThreshold
     IMGUI_API bool          IsMouseDragging(int button = 0, float lock_threshold = -1.0f);      // is mouse dragging. if lock_threshold < -1.0f uses io.MouseDraggingThreshold
     IMGUI_API ImVec2        GetMousePos();                                                      // shortcut to ImGui::GetIO().MousePos provided by user, to be consistent with other calls
     IMGUI_API ImVec2        GetMousePos();                                                      // shortcut to ImGui::GetIO().MousePos provided by user, to be consistent with other calls