Mirrors_UI_SDK/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-05-31 14:25:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed warnings for more stringent compilation settings. Added various small helpers.

Browse Source
This commit is contained in:
ocornut
2014-08-12 19:57:46 +01:00
parent c938affcac
commit 2573ffb6fc
3 changed files with 84 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imconfig.h
+2 -2
View File
@@ -28,7 +28,7 @@
/* /*
namespace ImGui namespace ImGui
{ {
void Value(const char* prefix, cosnt MyVec2& v, const char* float_format = NULL); void Value(const char* prefix, const MyVec2& v, const char* float_format = NULL);
void Value(const char* prefix, cosnt MyVec4& v, const char* float_format = NULL); void Value(const char* prefix, const MyVec4& v, const char* float_format = NULL);
}; };
*/ */
imgui.cpp
+70 -74
View File
File diff suppressed because it is too large Load Diff
imgui.h
+9 -6
View File
@@ -29,8 +29,8 @@ typedef ImU32 ImGuiID;
typedef int ImGuiCol; // enum ImGuiCol_ typedef int ImGuiCol; // enum ImGuiCol_
typedef int ImGuiKey; // enum ImGuiKey_ typedef int ImGuiKey; // enum ImGuiKey_
typedef int ImGuiColorEditMode; // enum ImGuiColorEditMode_ typedef int ImGuiColorEditMode; // enum ImGuiColorEditMode_
typedef ImU32 ImGuiWindowFlags; // enum ImGuiWindowFlags_ typedef int ImGuiWindowFlags; // enum ImGuiWindowFlags_
typedef ImU32 ImGuiInputTextFlags; // enum ImGuiInputTextFlags_ typedef int ImGuiInputTextFlags; // enum ImGuiInputTextFlags_
typedef ImBitmapFont* ImFont; typedef ImBitmapFont* ImFont;
struct ImVec2 struct ImVec2
@@ -143,6 +143,7 @@ namespace ImGui
void SetFontScale(float scale); void SetFontScale(float scale);
void SetScrollPosHere(); void SetScrollPosHere();
void SetTreeStateStorage(ImGuiStorage* tree); void SetTreeStateStorage(ImGuiStorage* tree);
ImGuiStorage* GetTreeStateStorage();
void PushItemWidth(float item_width); void PushItemWidth(float item_width);
void PopItemWidth(); void PopItemWidth();
float GetItemWidth(); float GetItemWidth();
@@ -221,9 +222,9 @@ namespace ImGui
// Logging // Logging
void LogButtons(); void LogButtons();
void LogToTTY(int max_depth); void LogToTTY(int max_depth = -1);
void LogToFile(int max_depth, const char* filename); void LogToFile(int max_depth = -1, const char* filename = NULL);
void LogToClipboard(int max_depth); void LogToClipboard(int max_depth = -1);
// Utilities // Utilities
void SetTooltip(const char* fmt, ...); // set tooltip under mouse-cursor, typically use with ImGui::IsHovered(). (currently no contention handling, last call win) void SetTooltip(const char* fmt, ...); // set tooltip under mouse-cursor, typically use with ImGui::IsHovered(). (currently no contention handling, last call win)
@@ -232,6 +233,8 @@ namespace ImGui
bool IsClipped(ImVec2 item_size); // to perform coarse clipping on user's side (as an optimisation) bool IsClipped(ImVec2 item_size); // to perform coarse clipping on user's side (as an optimisation)
bool IsKeyPressed(int key_index, bool repeat = true); // key_index into the keys_down[512] array, imgui doesn't know the semantic of each entry bool IsKeyPressed(int key_index, bool repeat = true); // key_index into the keys_down[512] array, imgui doesn't know the semantic of each entry
bool IsMouseClicked(int button, bool repeat = false); bool IsMouseClicked(int button, bool repeat = false);
bool IsMouseDoubleClicked(int button);
bool IsMouseHoveringBox(const ImVec2& box_min, const ImVec2& box_max);
ImVec2 GetMousePos(); ImVec2 GetMousePos();
float GetTime(); float GetTime();
int GetFrameCount(); int GetFrameCount();
@@ -469,7 +472,7 @@ struct ImGuiTextBuffer
size_t size() const { return Buf.size()-1; } size_t size() const { return Buf.size()-1; }
bool empty() { return Buf.empty(); } bool empty() { return Buf.empty(); }
void clear() { Buf.clear(); Buf.push_back(0); } void clear() { Buf.clear(); Buf.push_back(0); }
void Append(const char* fmt, ...); void append(const char* fmt, ...);
}; };
// Helper: Key->value storage // Helper: Key->value storage