omar
|
9191b17218
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
4c4f1b0224
|
ImVector: Added ImVector::push_front helper.
|
7 years ago |
|
omar
|
532f564fd3
|
ImGuiTextBuffer: Renamed append() helper to appendf(), appendv() to appendfv(). Added reserve().
|
7 years ago |
|
omar
|
d9c5d72962
|
ImGuiStorage: Added BuildSortByKey() helper to rebuild storage from stratch.
|
7 years ago |
|
omar
|
2543807e56
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
7 years ago |
|
omar
|
3f5b2a3fe3
|
Exposed ImDrawCornerFlags, replaced occurences of ~0 with an explicit ImDrawCornerFlags_All. Inversed BotLeft (prev 1<<3, now 1<<2) and BotRight (prev 1<<2, now 1<<3).
|
7 years ago |
|
omar
|
31683cfe34
|
ImDrawList::AddImageRounded: removed PrimDistributeUV declaration, fixed coding style, restored argument order from original PR. (#845)
|
7 years ago |
|
omar
|
ba095f81a5
|
Merge branch '2016-08-rounded-image' of https://github.com/thedmd/imgui into thedmd-2016-08-rounded-image
|
7 years ago |
|
omar
|
8c0f2e4946
|
Added comment to help people dealing with 58345b11e1 breakage (#707)
|
7 years ago |
thedmd
|
79f07f6ff0
|
Add AddImageRounded() to ImDrawList
|
7 years ago |
|
omar
|
9848a7023b
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
7 years ago |
|
omar
|
abbf836fd0
|
Style, Begin: removed ImGuiWindowFlags_ShowBorders window flag. Borders are now fully set up in the ImGuiStyle structure (see e.g. style.FrameBorderSize, style.WindowBorderSize). Use ImGui::ShowStyleEditor() to look them up. (#707, fix #819, #1031, ref #1019, ref #447)
|
7 years ago |
|
omar
|
c433bc971f
|
Reorder fields for consistency.
|
7 years ago |
|
omar
|
39137ccc3e
|
Style: renamed ImGuiCol_ChildWindowBg to ImGuiCol_ChildBg. (#707)
|
7 years ago |
|
omar
|
9886b09a0a
|
Minor tweak, removed extraneous empty destructor.
|
7 years ago |
Jason Wilkins
|
e605f21797
|
TreePush with zero arguments was ambiguous. Resolved by making it call TreePush(const void*)
|
7 years ago |
|
omar
|
9a44d447cd
|
NewFrame() now asserts if neither Render or EndFrame have been called. Exposed EndFrame(). Made it legal to call EndFrame() more than one. (#1423 etc.)
|
7 years ago |
|
omar
|
d211a0e338
|
Merge branch 'master' into navigation (with style breakable)
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
|
7 years ago |
|
omar
|
4daf377c9b
|
Added comment about TextUnformatted(). (#1450)
|
7 years ago |
|
omar
|
d7af1a218e
|
Style: Added PopupRounding setting. (#1112)
|
7 years ago |
|
omar
|
0a61b7195c
|
Style: Added a default StyleColorsLight(). (#707)
|
7 years ago |
|
omar
|
58345b11e1
|
Style: Removed ImGuiCol_ComboBg in favor of combo boxes using ImGuiCol_PopupBg for consistency. (#707)
|
7 years ago |
|
omar
|
bd4bc929ce
|
Style: renamed style.ChildWindowRounding to style.ChildRounding, ImGuiStyleVar_ChildWindowRounding to ImGuiStyleVar_ChildRounding.
|
7 years ago |
|
omar
|
6817f3a3d9
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
f5bdf443c9
|
Minor comments, tweaks
|
7 years ago |
|
omar
|
2275cb8b83
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
30bf40195b
|
io.OptNoCursorBlink -> io.OptCursorBlink (#1427)
|
7 years ago |
|
omar
|
669498ff26
|
Added io.OptNoCursorBlink option to disable cursor blinking. (#1427). Renamed io.OSXBehaviors to io.OptMacOSXBehaviors. Should affect users as the compile-time default is usually enough. (#473, #650)
|
7 years ago |
|
omar
|
0d4c320f88
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
|
7 years ago |
|
omar
|
ff4d4ca651
|
IsWindowHovered(): Added ImGuiHoveredFlags_FlattenChilds flag. Made IsRootWindowOrAnyChildHovered() obsolete in favor of IsWindowHovered( ImGuiHoveredFlags_FlattenChilds) (#1382, #1404)
|
7 years ago |
Giuseppe Barbieri
|
6fb43f2011
|
Update imgui.h
|
7 years ago |
|
omar
|
63f6f2dd13
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
|
7 years ago |
|
omar
|
fba704bf5d
|
Examples: Added a bunch of comments/referencs related to io.WantCaptureMouse, io.WantCaptureKeyboard (#1262, #1237, #1219, #635, #1058, #1051, #912, #533, #703, #446, #459, #364, #213, #52, and more)
|
7 years ago |
|
omar
|
59323b54da
|
Demo: Comments (#1408)
|
7 years ago |
|
omar
|
7f06d385a1
|
Added assertions and comments for incorrect use/understanding of IsWindowFocused() etc. functions
|
7 years ago |
|
omar
|
cb38caeda4
|
Examples: Added more comments near the fonts loading section, to catch common questions and errors (e.g. #1397, #1366, #1341, #1222, #1193, #1115, #951, etc.)
|
7 years ago |
|
omar
|
edafbcd630
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
|
7 years ago |
|
omar
|
c503a50cff
|
Styles: Moved Classic colors code to imgui_draw.cpp. Sneakily added a StyleColorsDark() function.
|
7 years ago |
|
omar
|
77df1ba9e0
|
Version 1.53 WIP
|
7 years ago |
|
omar
|
b422f35872
|
IO: Tracking extra mouse dragging data which is convenient for implementating various manual drag and drop patterns.
|
7 years ago |
|
omar
|
c0b366b316
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.h
|
7 years ago |
|
omar
|
9f200d10d5
|
Version 1.52
|
7 years ago |
|
omar
|
5afee1c6f3
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_internal.h
|
7 years ago |
|
omar
|
8dd7648db2
|
Comments
|
7 years ago |
|
omar
|
3656f2c769
|
NewFrame: Allow MovedWindow setting the ImGuiWindowFlags_NoInputs after moving has started in order to be able to detect windows below it, which is useful for e.g. docking mechanisms.
|
7 years ago |
|
omar
|
f10a1d7b9e
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
7 years ago |
|
omar
|
a6ff14d66e
|
Exposed IM_ARRAYSIZE() in imgui.h
|
7 years ago |
|
omar
|
f6ff373b22
|
Nav: #define IMGUI_HAS_NAV to ease sharing code across branches of imgui
|
7 years ago |
|
omar
|
6f0aa766e1
|
Nav: Added internal ImGuiNavReadMode_Released test for key releases.
|
7 years ago |
|
omar
|
d769e2515a
|
Merge branch 'master' into navigation
|
7 years ago |