omar
|
23b67e6ff5
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-07-17 19:52:14 +02:00 |
|
omar
|
93321d3280
|
Nav: Fixed CTRL+TAB windowing list from always showing the implicit Debug window. (#787)
|
2018-07-17 19:48:53 +02:00 |
|
Rokas Kupstys
|
7e59eb026b
|
Fix warning when IMGUI_DEFINE_MATH_OPERATORS is already defined by build system. (#1950)
|
2018-07-17 17:17:56 +02:00 |
|
omar
|
7b4fbf4301
|
Viewport: Removed the need for the back-end to fill io.MousePosViewport, it seems unnecessary at this point. (#1542)
|
2018-07-17 16:37:10 +02:00 |
|
omar
|
b8b74970d7
|
Internals: Viewport: Renamed g.MouseRefViewport to g.MouseViewport. (#1542)
|
2018-07-17 16:04:47 +02:00 |
|
omar
|
defbf1c4b3
|
Viewport: when moving window we use the moving window viewport unless drag and dropping. This is to fix e.g. IsItemHovered() + Tooltip pattern that may be active while moving a window. (#1542)
|
2018-07-17 15:56:02 +02:00 |
|
omar
|
16c6734bcb
|
Viewport: Revert part of 7abf72e, the viewport ownership stealing is problematic. (#1542). Will rework in the context of docking. (+1 squashed commits)
+ Fixed unused prototype warning (left-over from a merge)
|
2018-07-17 15:14:19 +02:00 |
|
omar
|
0c207b7bc9
|
Demo: Clarified the use of IsItemHovered()/IsItemActive() right after being in the "Active, Focused, Hovered & Focused Tests" section. This will be of more importance with the introduction of tabs.
|
2018-07-17 11:49:41 +02:00 |
|
omar
|
ee98a069f0
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# imgui_demo.cpp
|
2018-07-16 22:25:36 +02:00 |
|
omar
|
d3be9185b3
|
Demo: Fixed spacing from b629f90 change.
|
2018-07-16 22:24:39 +02:00 |
|
omar
|
73e13a0762
|
Examples: Tweaked the main.cpp example structure for all examples. (There are a few hidden agendas here: 1) I would like to avoid encouraging people from using the implicit "Debug" window, and promote using Begin/End. In spite of my best attempt, there are a few feature of the upcoming docking system that cannot work 100% properly for the implicit Debug window, so future proof let's not put that feature in the spotlight too much for new users. 2) Moved dumb hardcoded positions into a single spot that can be replaced with a viewport relative position and not affect other demo windows. 3) Calling ShowDemoWindow before anything else, also for the benefit of a specific docking demo which will have an ordering constraint which is not really problematic in a real app but shouldn't be put forward in the demo.
|
2018-07-16 22:17:34 +02:00 |
|
omar
|
abe7b190dc
|
Examples: DX10, DX11: Fixed unreleased resources in Init and Shutdown functions. (#1944)
|
2018-07-13 11:25:54 +02:00 |
|
omar
|
badde9a970
|
Demo: Spacing.
|
2018-07-12 11:58:50 +02:00 |
|
omar
|
b30b82835a
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
|
2018-07-12 11:48:49 +02:00 |
|
omar
|
b629f90393
|
Demo: Re-ordered example app code to match their menu order and forward declaration order + added header to delimitate them.
|
2018-07-12 11:42:33 +02:00 |
|
omar
|
d107146687
|
Viewport: Fixed CTRL+TAB windowing list displaying too many dimming layers (fix dd61c48 for viewport branch)
|
2018-07-12 11:19:17 +02:00 |
|
omar
|
5e73e969fb
|
Comments, exposed a few things in imgui_internal.h for consistency, added ImQsort wrapper.
|
2018-07-12 11:08:24 +02:00 |
|
omar
|
88df66ec83
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
|
2018-07-12 10:03:18 +02:00 |
|
omar
|
23288547ec
|
Revert part of c7016c2 incorrectly renaming ImGuiCol_NavWindowingHighlight to ImGuiCol_NavWindowListHighlight, that was wholly unnecessary (and not documented!). (also invalidate #1939)
|
2018-07-12 09:53:10 +02:00 |
|
omar
|
59fb3274a7
|
Examples: include for intptr_t on tdm-gcc + mingw32 (#1936) + mouse buttons comments
|
2018-07-11 20:03:47 +02:00 |
|
omar
|
9007dff5eb
|
IsItemHovered(): Added ImGuiHoveredFlags_AllowWhenDisabled flag to query hovered status on disabled items. (#1940, #211)
+ shallow changelog tweaks
|
2018-07-10 19:16:57 +02:00 |
|
omar
|
fff014dfed
|
Examples: OpenGL3: Added shaders more versions of GLSL + made the example app default to GL 3.0 + GLSL 130 (instead of GL 3.2 + GLSL 150) unless on Mac. (#1938, #1900, #1513, #1466, etc.)
|
2018-07-10 18:29:57 +02:00 |
|
omar
|
b829671df1
|
Fixed missing value in GetStyleColorName(). (#1939) broken with c7016c2
|
2018-07-10 16:45:54 +02:00 |
|
omar
|
de13261f1b
|
OpenGL3: Added error output when shaders fail to compile / link. (#1938)
|
2018-07-10 16:09:34 +02:00 |
|
omar
|
4dfb9ef751
|
Internals: Extracted StartMouseMovingWindow so we can add code to turn an arbitrary widget into a window mover (will be useful to make the Collapse button a window mover past a mouse drag threshold) + added a couple of _None flags.
|
2018-07-10 11:16:40 +02:00 |
|
omar
|
ce18371d1b
|
Internals: Fixed CalcSizeContents() returning negative value on first run (inconsequential afaik, but fixing for sanity)
|
2018-07-09 21:49:49 +02:00 |
|
omar
|
dc021f1c23
|
Internals: Fixed CalcSizeContents() returning negative value on first run (inconsequential afaik, but fixing for sanity)
|
2018-07-09 21:38:37 +02:00 |
|
omar
|
9dea27b273
|
Viewport: Made it possible for the moving window to detach and recreate its own Viewport (used by Docking)
|
2018-07-09 21:18:41 +02:00 |
|
omar
|
140ece0aeb
|
Internals: HoveredWindowUnderMovingWindow special handling for drag and drop of window without altering the _NoInputs window flag, which worked but messed up the IsWindowHovered() user-facing flags.
|
2018-07-09 21:18:10 +02:00 |
|
omar
|
7abf72ec78
|
Viewport: Reapply/recover ownership of viewport which is convenient for docking but also can recover from faulty .ini files. (#1542)
|
2018-07-09 21:13:51 +02:00 |
|
omar
|
17f36038e0
|
Internals: Misc/shallow merge from Docking branch.
|
2018-07-09 21:10:47 +02:00 |
|
omar
|
574185426c
|
Internals: Misc/shallow merge from Docking branch.
|
2018-07-09 21:06:46 +02:00 |
|
omar
|
7033b2043b
|
Internals: Move IMGUI_CDECL declaration to imgui_internal.h so everyone can profit.
|
2018-07-09 20:34:12 +02:00 |
|
omar
|
dd61c4802a
|
Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. (#787)
|
2018-07-09 19:22:49 +02:00 |
|
omar
|
c7016c25e8
|
Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. (#787)
|
2018-07-09 19:16:48 +02:00 |
|
omar
|
14cef31467
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-07-09 16:24:01 +02:00 |
|
omar
|
0708f91617
|
Internals: Removed RootWindowForTabbing, won't be needed. Nav: Not starting NavWindowingTarget when a modal is active (was not noticeable).
|
2018-07-09 16:20:14 +02:00 |
|
omar
|
6201cad2b4
|
Examples: Comments, Demo: Log early out, TODO. (#1553)
|
2018-07-09 11:43:53 +02:00 |
|
omar
|
17efd7b3b0
|
Demo: Added basic Drag and Drop demo. (#143, #1931)
|
2018-07-08 20:06:49 +02:00 |
|
omar
|
bd6097ac6f
|
Drag and Drop: Calling BeginTooltip() between a BeginDragSource()/EndDragSource() or BeginDropTarget()/EndDropTarget() uses adjusted tooltip settings matching the one created when calling BeginDragSource() without the ImGuiDragDropFlags_SourceNoPreviewTooltip flag. (#143) + additional safety checks.
|
2018-07-08 20:06:49 +02:00 |
|
omar
|
64938178b7
|
Internals: Moved selectable flags to avoid collision with public flags + rewrote some tests so we can consistently grep for (held && hovered)
|
2018-07-08 18:23:12 +02:00 |
|
omar
|
a33f0d1f7f
|
Drag and Drop: Fixed ImGuiDragDropFlags_SourceNoDisableHover to affect hovering state prior to calling IsItemHovered() + fixed description. (#143)
|
2018-07-08 16:38:57 +02:00 |
|
vby
|
3a42eb6620
|
Fix missing ImmReleaseContext in default Win32 IME handler (#1932)
|
2018-07-08 15:24:12 +02:00 |
|
omar
|
b0cdfe0ece
|
Generalized d11d211e so regular popups (without the AlwaysAutoResize flag) also have a smaller minimum size, but reduced it to an arbitrary 4.0f instead of 1.0f to ease debugging of faulty situations. (#1909)
|
2018-07-08 13:27:16 +02:00 |
|
omar
|
6277781e83
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-07-08 13:08:16 +02:00 |
|
omar
|
c790723cfa
|
Drag and Drop: Fixed an incorrect assert when dropping a source that is submitted after the target (bug introduced with 1.62 changes related to the addition of IsItemDeactivated()). (#1875, #143)
|
2018-07-08 13:03:39 +02:00 |
|
omar
|
89e2ddf07f
|
Examples: Comments + shallow coding convention tweak to be consistent across examples and with imgui_impl_osx
|
2018-07-08 11:16:11 +02:00 |
|
omar
|
569e0f07f1
|
Examples: Removed old example_apple/ + tweak comments (#1873)
|
2018-07-08 10:57:16 +02:00 |
|
Omar Cornut
|
839e4d34bd
|
Merge branch 'warrenm_osx'
|
2018-07-08 10:47:55 +02:00 |
|
Omar Cornut
|
c3f9220c15
|
Apple: Fixed example_osx_opengl2, renamed to example_apple_opengl2 + misc comments
|
2018-07-08 10:47:31 +02:00 |
|