|
|
@@ -1,4 +1,4 @@
|
|
|
-// ImGui library v1.45
|
|
|
+// ImGui library v1.46 WIP
|
|
|
// Headers
|
|
|
|
|
|
// See imgui.cpp file for documentation.
|
|
|
@@ -17,7 +17,7 @@
|
|
|
#include <stdlib.h> // NULL, malloc, free, qsort, atoi
|
|
|
#include <string.h> // memset, memmove, memcpy, strlen, strchr, strcpy, strcmp
|
|
|
|
|
|
-#define IMGUI_VERSION "1.45"
|
|
|
+#define IMGUI_VERSION "1.46 WIP"
|
|
|
|
|
|
// Define assertion handler.
|
|
|
#ifndef IM_ASSERT
|
|
|
@@ -404,7 +404,7 @@ namespace ImGui
|
|
|
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 IsMouseHoveringAnyWindow(); // is mouse hovering any visible window
|
|
|
- IMGUI_API bool IsMouseHoveringRect(const ImVec2& pos_min, const ImVec2& pos_max); // 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& pos_min, const ImVec2& pos_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 ImVec2 GetMousePos(); // shortcut to ImGui::GetIO().MousePos provided by user, to be consistent with other calls
|
|
|
IMGUI_API ImVec2 GetMousePosOnOpeningCurrentPopup(); // retrieve backup of mouse positioning at the time of opening popup we have BeginPopup() into
|
|
|
@@ -456,6 +456,7 @@ enum ImGuiWindowFlags_
|
|
|
ImGuiWindowFlags_NoInputs = 1 << 9, // Disable catching mouse or keyboard inputs
|
|
|
ImGuiWindowFlags_MenuBar = 1 << 10, // Has a menu-bar
|
|
|
ImGuiWindowFlags_HorizontalScrollbar = 1 << 11, // Enable horizontal scrollbar (off by default). You need to use SetNextWindowContentSize(ImVec2(width,0.0f)); prior to calling Begin() to specify width. Read code in imgui_demo in the "Horizontal Scrolling" section.
|
|
|
+ ImGuiWindowFlags_NoFocusOnAppearing = 1 << 12, // Disable taking focus when transitioning from hidden to visible state
|
|
|
// [Internal]
|
|
|
ImGuiWindowFlags_ChildWindow = 1 << 20, // Don't use! For internal use by BeginChild()
|
|
|
ImGuiWindowFlags_ChildWindowAutoFitX = 1 << 21, // Don't use! For internal use by BeginChild()
|
|
|
@@ -1241,7 +1242,7 @@ struct ImFont
|
|
|
// Members: Settings
|
|
|
float FontSize; // <user set> // Height of characters, set during loading (don't change after loading)
|
|
|
float Scale; // = 1.0f // Base font scale, multiplied by the per-window font scale which you can adjust with SetFontScale()
|
|
|
- ImVec2 DisplayOffset; // = (0.0f,0.0f) // Offset font rendering by xx pixels
|
|
|
+ ImVec2 DisplayOffset; // = (0.0f,1.0f) // Offset font rendering by xx pixels
|
|
|
ImWchar FallbackChar; // = '?' // Replacement glyph if one isn't found. Only set via SetFallbackChar()
|
|
|
ImFontConfig* ConfigData; // // Pointer within ImFontAtlas->ConfigData
|
|
|
int ConfigDataCount; //
|