bebe03db05
Metrics: Minor formatting tweaks
2018-01-30 21:17:27 +01:00
bd579e5429
Nav: Removed io.NavUsable --> io.NavActive, io.NavActive --> io.NavVisible. ( #787 ). NavActive takes account of NavFlags enable flags.
2018-01-30 20:07:12 +01:00
c851b33352
Nav: Added proper version of ImGuiWindowFlags_NavFlattened that handles scrolling nicely. Marked as private as I'm not happy with the name. ( #787 )
2018-01-29 23:59:46 +01:00
6f366fff6b
Demo: Tweaked example menu with colors + menu items, was currently particularly inconvenient for Nav. Will rework later. ( #787 )
2018-01-24 17:41:47 +01:00
455989b8b1
Nav: Added io.NavFlags to hold various options. Added ImGuiNavFlags_EnableGamepad and ImGuiNavFlags_EnableKeyboard for bindings to use ( #787 )
2018-01-24 17:41:47 +01:00
d500113f1d
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
2018-01-23 19:16:43 +01:00
9a76fd30fd
Added SetNextWindowBgAlpha() helper. ( #1567 ) particularly helpul with the marking of the old 5-parameters version of Begin() as obsolete.
2018-01-23 19:13:49 +01:00
1493de4f81
Internals: Merge of harmless stuff from Navigation stuff. Added GetHoveredID() internal helper.
2018-01-12 19:53:27 +01:00
c85d7d6e49
Nav: Remove GetItemID(), hide ActivateItem() before this feature is unfinished and has issue (full feature is on hold). Undo part of 59c6f35bf6 ( #787 )
2018-01-12 19:28:37 +01:00
cd7e178eac
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-11 16:49:59 +01:00
a8bbb0b7dd
Demo: Using IM_COL32() instead of ImColor() in ImDrawList centric contexts.
2018-01-11 15:47:07 +01:00
12aa3cb09e
Demo: Tweaks format.
2018-01-11 15:22:33 +01:00
a63fbbca8b
Added ImGuiHoveredFlags_AnyWindow, ImGuiFocusedFlags_AnyWindow. Obsoleted IsAnyWindowHovered()/IsAnyWindowFocused() in favor of IsWindowHovered(ImGuiHoveredFlags_AnyWindow)/IsWindowFocused(ImGuiFocusedFlags_AnyWindow). Added to demo. ( #1382 )
2018-01-11 13:51:18 +01:00
2b8224692e
Merge branch 'master' into navigation
2018-01-03 20:26:24 +01:00
a7deb3a394
Demo: Minor tweaks.
2018-01-03 15:36:51 +01:00
9fbecac87e
Demo: Improved Selectable() examples. ( #1528 )
2018-01-03 15:11:14 +01:00
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
