Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-22 11:57:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweaks

Browse Source
This commit is contained in:
ocornut 2015-07-21 20:06:34 -06:00
parent e1ac5a3198
commit 62c888177a
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
imconfig.h
View File

@ -30,7 +30,7 @@
//#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS //#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS
//---- Implement STB libraries in a namespace to avoid conflicts //---- Implement STB libraries in a namespace to avoid conflicts
//#define IMGUI_STB_NAMESPACE ImStb //#define IMGUI_STB_NAMESPACE ImGuiStb
//---- Define constructor and implicit cast operators to convert back<>forth from your math types and ImVec2/ImVec4. //---- Define constructor and implicit cast operators to convert back<>forth from your math types and ImVec2/ImVec4.
/* /*

13
imgui.cpp
View File

@ -538,11 +538,10 @@ static void KeepAliveID(ImGuiID id);
static bool IsMouseHoveringRect(const ImRect& bb); static bool IsMouseHoveringRect(const ImRect& bb);
static bool IsKeyPressedMap(ImGuiKey key, bool repeat = true); static bool IsKeyPressedMap(ImGuiKey key, bool repeat = true);
static bool IsMouseHoveringRect(const ImRect& rect);
static inline ImGuiWindow* GetCurrentWindow(); static inline ImGuiWindow* GetCurrentWindow();
static inline void SetCurrentWindow(ImGuiWindow* window); static ImGuiWindow* GetParentWindow();
static inline ImGuiWindow* GetParentWindow(); static void SetCurrentWindow(ImGuiWindow* window);
static void SetWindowScrollY(ImGuiWindow* window, float new_scroll_y); static void SetWindowScrollY(ImGuiWindow* window, float new_scroll_y);
static void SetWindowPos(ImGuiWindow* window, const ImVec2& pos, ImGuiSetCond cond); static void SetWindowPos(ImGuiWindow* window, const ImVec2& pos, ImGuiSetCond cond);
static void SetWindowSize(ImGuiWindow* window, const ImVec2& size, ImGuiSetCond cond); static void SetWindowSize(ImGuiWindow* window, const ImVec2& size, ImGuiSetCond cond);
@ -554,7 +553,7 @@ static inline bool IsWindowContentHoverable(ImGuiWindow* window);
static void ClearSetNextWindowData(); static void ClearSetNextWindowData();
static void CheckStacksSize(ImGuiWindow* window, bool write); static void CheckStacksSize(ImGuiWindow* window, bool write);
static void Scrollbar(ImGuiWindow* window); static void Scrollbar(ImGuiWindow* window);
static bool CloseWindowButton(bool* p_opened = NULL); static bool CloseWindowButton(bool* p_opened);
static void FocusWindow(ImGuiWindow* window); static void FocusWindow(ImGuiWindow* window);
static void AddDrawListToRenderList(ImVector<ImDrawList*>& out_render_list, ImDrawList* draw_list); static void AddDrawListToRenderList(ImVector<ImDrawList*>& out_render_list, ImDrawList* draw_list);
@ -574,10 +573,10 @@ static ImVec4 GetVisibleRect();
static bool BeginPopupEx(const char* str_id, ImGuiWindowFlags extra_flags); static bool BeginPopupEx(const char* str_id, ImGuiWindowFlags extra_flags);
static void CloseInactivePopups(); static void CloseInactivePopups();
static ImGuiWindow* GetFrontMostModalRootWindow();
static void ClosePopupToLevel(int remaining); static void ClosePopupToLevel(int remaining);
static void ClosePopup(ImGuiID id); static void ClosePopup(ImGuiID id);
static bool IsPopupOpen(ImGuiID id); static bool IsPopupOpen(ImGuiID id);
static ImGuiWindow* GetFrontMostModalRootWindow();
static ImVec2 FindBestPopupWindowPos(const ImVec2& base_pos, const ImVec2& size, ImGuiWindowFlags flags, int* last_dir, const ImRect& r_inner); static ImVec2 FindBestPopupWindowPos(const ImVec2& base_pos, const ImVec2& size, ImGuiWindowFlags flags, int* last_dir, const ImRect& r_inner);
static inline void ParseFormatPrecision(const char* fmt, int& decimal_precision); static inline void ParseFormatPrecision(const char* fmt, int& decimal_precision);
@ -1576,7 +1575,7 @@ static inline ImGuiWindow* GetCurrentWindow()
return g.CurrentWindow; return g.CurrentWindow;
} }
static inline void SetCurrentWindow(ImGuiWindow* window) static void SetCurrentWindow(ImGuiWindow* window)
{ {
ImGuiState& g = *GImGui; ImGuiState& g = *GImGui;
g.CurrentWindow = window; g.CurrentWindow = window;
@ -1584,7 +1583,7 @@ static inline void SetCurrentWindow(ImGuiWindow* window)
g.FontSize = window->CalcFontSize(); g.FontSize = window->CalcFontSize();
} }
static inline ImGuiWindow* GetParentWindow() static ImGuiWindow* GetParentWindow()
{ {
ImGuiState& g = *GImGui; ImGuiState& g = *GImGui;
IM_ASSERT(g.CurrentWindowStack.Size >= 2); IM_ASSERT(g.CurrentWindowStack.Size >= 2);