omar
|
a263dce2f2
|
Combo: Cleanup. Removed unrequired uses of the _ComboBox flag (the test in EndChild() is from commit no 1!). We could remove ImGuiWindowFlags_ComboBox soonish.
|
2017-12-08 17:21:45 +01:00 |
|
omar
|
9ce51ad9f6
|
Fix bad merge
|
2017-12-08 15:11:35 +01:00 |
|
omar
|
a6f37287d8
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-12-08 15:06:37 +01:00 |
|
omar
|
7ac5f11b29
|
Standardizing the casing/format of internal window names + Misc comments.
|
2017-12-08 15:04:06 +01:00 |
|
omar
|
befc58771c
|
Combo: Recycling windows by using a stack number instead of a unique id, wasitng less windows.
|
2017-12-08 15:03:37 +01:00 |
|
omar
|
e998c7d3e3
|
Combo: Moved functions (untouched).
|
2017-12-08 15:03:32 +01:00 |
|
omar
|
a5e9392140
|
Combo: Added flags to BeginCombo() new api, removed explicit height, default to 8 instead of 7 items, allow popup height constraints via SetNextWindowSizeConstraints(), width expand if contents doesn't fit, popup reposition policy if it doesn't fit.
|
2017-12-08 15:03:26 +01:00 |
|
omar
|
d9d231dc6b
|
Internals: Renamed CalcSizeFullWithConstraint() to CalcSizeAfterConstraint() which is more appropriate + added explicit parameter to CalcSizeAutoFit() so it can be used externally.
|
2017-12-08 15:02:17 +01:00 |
|
omar
|
74f42baf3e
|
Fixed scrollbar issue, source size when explicit was read before applying custom size constraints (followup to cc2c023880 etc.)
|
2017-12-08 15:00:56 +01:00 |
|
omar
|
541dfd7901
|
Combo: Comments + fixed missing lower window padding.
|
2017-12-08 15:00:02 +01:00 |
|
omar
|
9872297a84
|
Internals: Renamed FindBestPopupWindowPos() to FindBestWindowPosForPopup()
|
2017-12-08 14:59:49 +01:00 |
|
omar
|
a4863e8084
|
Demo: Picker with palette demo supports drag and drop. (#143, #346)
|
2017-12-08 12:49:35 +01:00 |
|
omar
|
7bf85db6c4
|
Drag and drop: Added COL3F payload for color without alpha overwrite. Exposed standard color payload types in imgui.h (#143)
|
2017-12-08 12:48:53 +01:00 |
|
omar
|
b6b940c8ee
|
Merge branch 'master' into navigation + removed extraneous g.NavDisableMouseHover test in IsItemHovered()
# Conflicts:
# imgui.cpp
|
2017-12-08 09:35:23 +01:00 |
|
omar
|
e118239f69
|
IsItemHovered() comments (#1382)
|
2017-12-08 09:34:05 +01:00 |
|
omar
|
553b0fcf8f
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-12-07 21:20:16 +01:00 |
|
omar
|
ca0bb000ad
|
Begin: Factored out a bit of code to CalcSizeContents()
|
2017-12-07 21:14:54 +01:00 |
|
omar
|
f658edc72a
|
Begin: Remove unnecessary usage of window_is_new flag, as both fields are zero on window creation.
|
2017-12-07 21:14:49 +01:00 |
|
omar
|
45466a8cf9
|
Internals: BeginCombo() added dummy ImGuiComboFlags.
|
2017-12-07 21:14:41 +01:00 |
|
omar
|
97edd42fc0
|
Indent(), Unindent(): Allow passing negative values.
|
2017-12-07 21:14:25 +01:00 |
|
omar
|
7f2b9ea4c0
|
Begin: Minor refactor following fcf652f8ee7267055e331bf7a0133ed477816f27. Merging the if (Collapsed) block with the main one.
|
2017-12-07 21:14:13 +01:00 |
|
omar
|
8dcc1a8a20
|
Begin: Sizing fixes regarding uses SetNextWindowSize() on individual axises.
|
2017-12-07 21:14:00 +01:00 |
|
omar
|
e045eddd77
|
Minor tweaks. Using ImGuiAxis defines.
|
2017-12-07 21:13:23 +01:00 |
|
omar
|
92f7bd3605
|
Fixed 64-bit warnings.
|
2017-12-07 21:06:15 +01:00 |
|
omar
|
cc2c023880
|
Fixed scrollbar issue, followup to beda5fc5a0 and 2df8fa95df.
|
2017-12-07 17:04:53 +01:00 |
|
omar
|
e6215b6ca0
|
Merge branch 'master' into navigation + merge fix
# Conflicts:
# imgui.cpp
|
2017-12-07 16:42:52 +01:00 |
|
omar
|
3c9f9a455e
|
Internals: Cleanup FindBestPopupWindowPos() to be more digestible, since we are bounds to rework the logic there. No functional changes intended. FIXED TYPO.
|
2017-12-07 16:36:07 +01:00 |
|
omar
|
8959c64b33
|
Internals: Cleanup FindBestPopupWindowPos() to be more digestible, since we are bounds to rework the logic there. No functional changes intended
|
2017-12-07 13:29:14 +01:00 |
|
omar
|
abe5ad3c7a
|
Demo: Added display for IsMouseDragging() function.
|
2017-12-07 13:27:55 +01:00 |
|
omar
|
94bf12f14b
|
Demo: Display better mouse cursor info for debugging backends.
|
2017-12-07 13:27:49 +01:00 |
|
omar
|
20c7aab60c
|
Exposed GetOverlayDrawList(). (~#545, ~#530)
|
2017-12-07 12:49:52 +01:00 |
|
omar
|
6deb865f78
|
Nav: Merge fix.
|
2017-12-06 17:48:28 +01:00 |
|
omar
|
2fc6a82665
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
|
2017-12-06 17:44:40 +01:00 |
|
omar
|
8f41508c52
|
Begin: Move the code that update the Appearing flag above the BeginDocked() branch.
|
2017-12-06 17:42:28 +01:00 |
|
omar
|
2fc9a2e6e7
|
Fixed nav branch merge issue.
|
2017-12-06 15:20:36 +01:00 |
|
omar
|
beda5fc5a0
|
Fixed scrollbar enable/disable calculation when size is modified programmatically. This is the generalization of the fix in 2df8fa95df.
|
2017-12-06 15:13:45 +01:00 |
|
omar
|
ecacaf7f2d
|
Lower-right resize grip only appears when hovered. (#822)
|
2017-12-06 15:13:45 +01:00 |
|
omar
|
3b7e4eaf38
|
Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. (#822)
|
2017-12-06 15:13:45 +01:00 |
|
omar
|
531e559e49
|
Windows can be resized from their borders when ImGuiWindowFlags_ResizeFromAnySide is set. (#822) The interaction is currently unsatisfying because we can only reach a window from its inner rectangle (because of HoveredWindow filtering).
|
2017-12-06 15:13:45 +01:00 |
|
omar
|
e103fe8c1f
|
Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. (#822)
|
2017-12-06 15:13:45 +01:00 |
|
omar
|
90ae1c59c4
|
Added ImGuiWindowFlags_ResizeFromAnySide flag and code to resize from any of the 4 corners (only 2 corners enabled). (#822)
|
2017-12-06 15:13:45 +01:00 |
|
omar
|
fe2cf231a8
|
Update README.md
|
2017-12-06 11:18:17 +01:00 |
|
omar
|
729333293c
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
|
2017-12-05 22:56:35 +01:00 |
|
omar
|
0f119865a6
|
Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. (#822)
|
2017-12-05 22:53:58 +01:00 |
|
omar
|
5686c72bbd
|
Windows can be resized from their borders when ImGuiWindowFlags_ResizeFromAnySide is set. (#822) The interaction is currently unsatisfying because we can only reach a window from its inner rectangle (because of HoveredWindow filtering).
|
2017-12-05 22:47:20 +01:00 |
|
omar
|
b9dc0caee3
|
Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. (#822)
|
2017-12-05 22:44:52 +01:00 |
|
omar
|
2ca4f9e862
|
Added ImGuiWindowFlags_ResizeFromAnySide flag and code to resize from any of the 4 corners (only 2 corners enabled). (#822)
|
2017-12-05 22:42:57 +01:00 |
|
omar
|
364251146b
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-12-05 16:15:05 +01:00 |
|
omar
|
77d1a4b636
|
Fixed a one frame glitch, when window claiming focus themselves on appear, the title bar wouldn't use the focused color on that frame.
|
2017-12-05 16:12:45 +01:00 |
|
omar
|
16d9fa30b2
|
Merge branch 'master' into drag_and_drop
|
2017-12-05 09:21:07 +01:00 |
|