omar
|
185c1eaaf3
|
Alignment + removed comments
|
2017-12-11 22:55:28 +01:00 |
|
omar
|
f93945540f
|
Renamed ImGuiTreeNodeFlags_AllowOverlapMode to ImGuiTreeNodeFlags_AllowItemOverlap. (#600, #1330)
|
2017-12-11 22:42:12 +01:00 |
|
omar
|
45f440bb7d
|
Internals: Renamed ImGuiButtonFlags_FlattenChilds -> ImGuiButtonFlags_FlattenChildren, ImGuiButtonFlags_AllowOverlapMode -> ImGuiButtonFlags_AllowItemOverlap
|
2017-12-11 22:39:10 +01:00 |
|
omar
|
6b168b43ff
|
Comments (#822)
|
2017-12-11 19:47:23 +01:00 |
|
omar
|
2b9d8ab91d
|
Merge branch 'master' into drag_and_drop
# Conflicts:
# imgui.cpp
# imgui.h
|
2017-12-11 16:39:27 +01:00 |
|
omar
|
38bfdb357e
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
|
2017-12-11 16:28:47 +01:00 |
|
omar
|
f06f68f3ce
|
Obsoleted old functions: SetScrollPosHere (marked obsolete in 1.42, July 2015). GetWindowFont(), GetWindowFontSize() (marked obsolete in 1.48, March 2016)
|
2017-12-11 16:22:52 +01:00 |
|
omar
|
9fd15defe4
|
Added an implementation of SetItemDefaultFocus() in the master branch for combo patterns to use and be more forward-compatible. (#787)
|
2017-12-11 16:19:37 +01:00 |
|
omar
|
6d93011fdf
|
alloca fix to allow Clang with Microsoft CodeGen path
|
2017-12-11 10:25:44 +01:00 |
|
Branimir Karadžić
|
e67f3809ed
|
Replaced obsolete function with new one.
|
2017-12-11 09:57:05 +01:00 |
|
omar
|
d1db229907
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_demo.cpp
|
2017-12-10 19:01:59 +01:00 |
|
omar
|
71296910a0
|
Demo: Tweaks and spacing. Stopped using rand() function in demo code.
|
2017-12-10 18:49:47 +01:00 |
|
omar
|
4b8857d536
|
Demo: About box tweaks.
|
2017-12-10 18:45:05 +01:00 |
|
omar
|
1096e14356
|
ImFont: Added GetDebugName() helper.
|
2017-12-10 18:34:32 +01:00 |
|
omar
|
e3e0326ea9
|
Exposed BeginCombo() publicly.
|
2017-12-10 18:08:59 +01:00 |
|
omar
|
080f61858f
|
Sorted typedefs/enumations forward declarations in imgui.h
|
2017-12-10 17:57:27 +01:00 |
|
omar
|
eab6333a0b
|
SetNextWindowContentSize() adjust for client->window size, but the fate of borders isn't really clear for now (until now we always tried to make borders not affect layout, so if we want a 200x200 fully visible space with borders and zero window padding user need to include the borders) (#1490)
|
2017-12-10 17:36:30 +01:00 |
|
omar
|
7ac1583411
|
Scrollbar: Minor simplication of the code using InnerRect data.
|
2017-12-10 17:27:37 +01:00 |
|
omar
|
a9b01600ac
|
Internals: window->InnerRect includes removal of borders so it'll be easier to use from other locations.
|
2017-12-10 17:24:10 +01:00 |
|
omar
|
20ba79aa56
|
Demo: Added "No close" option.
|
2017-12-10 17:02:41 +01:00 |
|
omar
|
b75acc21b0
|
Fix for border under title bar when WindowBorderSize == 0 and FrameBorderSize > 0
|
2017-12-10 16:48:18 +01:00 |
|
omar
|
0872020c5c
|
Comments
|
2017-12-10 16:11:29 +01:00 |
|
omar
|
f72b002da8
|
Removed SetNextWindowContentWidth(), prefer using SetNextWindowContentSize(). Kept redirection function (will obsolete). (#246, #519, #1444)
|
2017-12-10 16:05:47 +01:00 |
|
Branimir Karadžić
|
e23083a080
|
Fixed warning: logical ‘and’ of equal expressions
|
2017-12-10 12:15:29 +01:00 |
|
omar
|
0365c524a2
|
ColorPicker4: Fixed returning true when holding mouse button on the sat/value/alpha locations. (#1489)
|
2017-12-09 21:25:20 +01:00 |
|
omar
|
a8c7b1a2a2
|
ColorEdit4: Made IsItemActive() return true when picker popup is active. (#1489)
|
2017-12-09 21:17:27 +01:00 |
|
omar
|
871a5cecc1
|
Merge branch 'master' into navigation
|
2017-12-08 18:32:46 +01:00 |
|
omar
|
c9f0275e22
|
Combo: Removed ImGuiWindowFlags_ComboBox flag. Moved internal window flags.
|
2017-12-08 18:32:12 +01:00 |
|
omar
|
457011660e
|
Mouse wheel scrolling doesn't change speed inside Combo box (uses to slow down from 5 to 3) but instead slow down on window that are smaller than the scroll speed.
|
2017-12-08 18:28:17 +01:00 |
|
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 |
|