05ec0b0736
Casing tweaks + clarify license copyright (simpler/safer?) ( #1346 )
2018-01-03 14:32:16 +01:00
96ccc484f9
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
2018-01-03 12:33:27 +01:00
3c6fbe0849
Renamed ImGuiSizeConstraintCallback to ImGuiSizeCallback, ImGuiSizeConstraintCallbackData to ImGuiSizeCallbackData.
2018-01-03 12:31:56 +01:00
7a15fc8de5
Merge branch 'master' into navigation
2017-12-29 18:28:23 +01:00
2dd2ca0096
Removed CalcItemRectClosestPoint() which was weird and not really used by anyone except demo code. If you need it it's easy to replicate on your side.
...
Removed internal corresponding ImRect::GetClosestPoint() for now.
Essentially revert dcaafffe0e
2017-12-29 17:59:13 +01:00
c4e6d622c1
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-12-29 13:39:07 +01:00
4ba2e85744
Demo: Tweak. Comments. Metrics: Added some Drag and Drop info.
2017-12-28 23:53:27 +01:00
49eed6e2d1
Version 1.54 WIP
2017-12-28 15:17:35 +01:00
436cad4bca
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
2017-12-26 15:37:31 +01:00
9511f22e8b
Demo: Console: More friendly to text color changes.
2017-12-25 18:47:44 +01:00
e916310b2e
Version 1.53
2017-12-25 17:41:41 +01:00
3d48f5b8c2
Demo: BeginCombo() demo code
2017-12-25 17:41:02 +01:00
de5c304b49
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-12-24 18:59:40 +01:00
8d54b1b7af
Misc comments, removed duplicated IM_ARRAYSIZE macro in imgui_demo.cpp (it is now declared in imgui.h)
2017-12-24 18:59:14 +01:00
1b86e7343f
Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).
2017-12-24 18:16:22 +01:00
cead207535
Comments
2017-12-24 17:58:41 +01:00
ffb4f6ca8c
Merge branch 'master' into navigation
2017-12-23 16:27:48 +01:00
983d8f5f8e
Various zealous warning fixes (Clang).
2017-12-23 15:28:49 +01:00
1c1e490316
Merge branch 'master' into navigation
2017-12-22 20:21:54 +01:00
e1a103b251
Drag and Drop: Disable tracking mouse button ownership when an external drag source is active, to make it easier to achieve drag and drop over multiple OS windows. ( #143 )
2017-12-22 20:20:52 +01:00
287380261c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-12-21 19:55:21 +01:00
996dfb21cf
ImDrawList: Added ImDrawListFlags for AA settings. ImDrawList doesn't directly depends on GImGui anymore.
2017-12-21 19:49:54 +01:00
6497f5dc1b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
2017-12-15 11:59:50 +01:00
eefea0588a
Using the ImGuiWindowFlags_NoScrollWithMouse flag on a child window forwards the mouse wheel event to the parent window, unless either ImGuiWindowFlags_NoInputs or ImGuiWindowFlags_NoScrollbar are also set. ( #1380 , #1502 )
2017-12-14 18:42:41 +01:00
fa68cb5364
Demo: Console: Tweak.
2017-12-13 23:07:07 +01:00
cc3192f347
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
2017-12-13 22:09:08 +01:00
3905816082
Added ShowFontSelector(), ShowStyleSelector(). ( #707 )
2017-12-13 21:59:16 +01:00
fa9327ccf8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
2017-12-12 20:44:12 +01:00
d0a1be0de0
Merge branch 'drag_and_drop'
2017-12-12 20:39:52 +01:00
ef1a683ebe
Removed use of obsolete ImGui API.
2017-12-12 17:59:09 +01:00
052b6021dd
Merge branch 'master' into drag_and_drop
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
2017-12-12 15:02:05 +01:00
0a3db267c3
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
2017-12-12 14:58:53 +01:00
6190ab0084
Renamed GetItemsLineHeightWithSpacing() to GetFrameHeightWithSpacing()
2017-12-12 14:14:58 +01:00
08b72eb5c0
IsWindowFocused() refactor will flags. ( #1382 )
...
Marked IsRootWindowFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootWindow).
Marked IsRootWindowOrAnyChildFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows).
2017-12-12 14:07:12 +01:00
8d8f4934fb
Demo: mouse dragging demo tweaks
2017-12-12 13:11:40 +01:00
4a555d35f0
IsWindowHovered(): split ImGuiHoveredFlags_FlattenChild into separate ChildWindows and RootWindow flags. Allowing more combination and a better symetry with IsWindowFocused() flags. ( #1382 )
2017-12-12 12:50:42 +01:00
2b9d8ab91d
Merge branch 'master' into drag_and_drop
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-12-11 16:39:27 +01:00
38bfdb357e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-12-11 16:28:47 +01:00
e67f3809ed
Replaced obsolete function with new one.
2017-12-11 09:57:05 +01:00
d1db229907
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
2017-12-10 19:01:59 +01:00
71296910a0
Demo: Tweaks and spacing. Stopped using rand() function in demo code.
2017-12-10 18:49:47 +01:00
4b8857d536
Demo: About box tweaks.
2017-12-10 18:45:05 +01:00
20ba79aa56
Demo: Added "No close" option.
2017-12-10 17:02:41 +01:00
871a5cecc1
Merge branch 'master' into navigation
2017-12-08 18:32:46 +01:00
c9f0275e22
Combo: Removed ImGuiWindowFlags_ComboBox flag. Moved internal window flags.
2017-12-08 18:32:12 +01:00
a4863e8084
Demo: Picker with palette demo supports drag and drop. ( #143 , #346 )
2017-12-08 12:49:35 +01:00
e6215b6ca0
Merge branch 'master' into navigation + merge fix
...
# Conflicts:
# imgui.cpp
2017-12-07 16:42:52 +01:00
abe5ad3c7a
Demo: Added display for IsMouseDragging() function.
2017-12-07 13:27:55 +01:00
94bf12f14b
Demo: Display better mouse cursor info for debugging backends.
2017-12-07 13:27:49 +01:00
81cbaef806
Merge branch 'master' into navigation
2017-11-29 23:49:17 +01:00
