06075f20ba
Merge branch 'master' into navigation
omar2017-11-10 11:42:08 +01:00
ba09de3a39
Begin: Fixed appending into a child window with a second Begin() from a different window stack querying the wrong window for the window->Collapsed test.
omar2017-11-10 11:37:27 +01:00
8451855a30
ButtonBehavior: Fixed ImGuiButtonFlags_AllowOverlapMode to avoid temporarily activating widgets on click before they have been correctly double-hovered. (#319, #600)
omar2017-11-09 20:08:29 +01:00
4b94738c7e
Drag and Drop: Drop target rectangle goes out of clipping range (#143)
omar2017-11-09 20:17:10 +01:00
b1653cd361
Drag and Drop: Allow NULL payload (since type only can be useful). (#143)
omar2017-11-09 20:09:09 +01:00
a297cbafdb
Merge branch 'master' into navigation
omar2017-11-08 23:17:14 +01:00
2df8fa95df
Fixed vertical scrollbar flickering/appearing, typically when manually resizing and using a pattern of filling available height (e.g. full sized BeginChild). THIS IS A GREAT FIX, this glitch was nasty and annoying (and yet somehow nobody reported it?). Hopefully haven't broken anything else...
omar2017-11-08 23:17:08 +01:00
a4cc3d4637
Minor tweaks/comments. Note that the reordering the one subtraction caused subtle havoc before the patch in 9ac8820ee2.
omar2017-11-08 22:36:31 +01:00
9ac8820ee2
Fixed non-pixel aligned bounding box of window resize grip, / which triumphally led to any re-arrangement of operations inside the resize grip code outputting non-exact size_target values which led to unstable window position because clamping code uses size in a subtraction, etc etc. Lovely how a whole system can be made to act weird with a single bad input.
omar2017-11-08 22:32:22 +01:00
b6504b8eee
Drag and drop: Handle overlapping drag target priorities given their surface, which appears to make most sense for drag and drop operations.
omar2017-11-08 15:47:52 +01:00
2ab27be3de
Child window with MenuBar use regular WindowPadding.y so layout look consistent in child or in a regular window.
omar2017-11-07 22:23:02 +01:00
41862b8c0e
ButtonBehavior: Fixed ImGuiButtonFlags_NoHoldingActiveID from incorrectly setting ActiveIdClickOffset, which probably have no known effect, but it is more correct this way. (#1418)
omar2017-11-07 16:41:58 +01:00
1870738880
LowerBound() minor tweaks
omar2017-11-07 14:05:48 +01:00
571b08f315
Internal: FindWindowByName() faster and doesn't touch every windows
omar2017-11-07 13:59:55 +01:00
8e6adc78af
Examples: Constrained Resize: Added more test cases (for #1417)
omar2017-11-07 11:38:14 +01:00
2c7ba21417
Fixed auto-resize allocating too much space for scrollbar when SizeContents is bigger than maximum window size (fixes c0547d358d) (#1417)
omar2017-11-07 11:37:38 +01:00
0d4c320f88
Merge branch 'master' into navigation
omar2017-11-06 23:58:28 +01:00
f0b4097c54
Begin: Simplified code and fixed a bug where appending into a window a second time (from a remote window) would incorrectly overwrite RootWindow with the current window in the stack. Our docking code uses this pattern.
omar2017-11-06 23:55:40 +01:00
de1e7dc088
Drag and Drop: Moved internal fields out of public sight. (#143)
omar2017-11-06 20:02:56 +01:00
8b725c94cb
Drag and Drop: Rework internal to allow overlapping targets (#143)
omar2017-11-06 19:39:23 +01:00
16a5da9521
RenderTriangle() minor tweak to align Left/Right and Up/Down arrow extents visually
omar2017-11-03 20:17:13 +01:00
553bdeedf7
Drag and Drop: Made it legal to not call SetDragDropPayload() between BeginDragDropSource() and EndDragDropSource(). (#143)
omar2017-11-02 18:30:46 +01:00
3461a2f296
Merge branch 'master' into drag_and_drop
omar2017-11-02 18:06:04 +01:00
ff4d4ca651
IsWindowHovered(): Added ImGuiHoveredFlags_FlattenChilds flag. Made IsRootWindowOrAnyChildHovered() obsolete in favor of IsWindowHovered( ImGuiHoveredFlags_FlattenChilds) (#1382, #1404)
omar2017-11-02 16:44:24 +01:00
803ac3a5c6
IsWindowHovered() Fix behavior when an item is active to use the same logic as IsItemHovered() (#1382, #1404)
omar2017-11-02 16:23:03 +01:00
5956fff7e2
Drag and Drop: ImGuiButtonFlags_PressedOnDragDropHold focuses the target window.
omar2017-10-30 00:10:05 +01:00
a810619555
Drag and Drop: Added support for drag and drop hold-long-to-open for CollapsingHeader() and TreeNode(). Open only!
omar2017-10-30 00:03:04 +01:00
1d7d8f8574
Merge branch 'master' into drag_and_drop
omar2017-10-29 23:49:24 +01:00
b13d281356
Maintaining ActiveIdTimer and HoveredIdTimer (the later is useful for drag and drop, both will be of course for creators of custom widgets)
omar2017-10-29 23:46:32 +01:00
0e775807b4
Drag and Drop: Added a mechanism to allow widgets with no identifiers (such as Text/Image) to be used with BeginDragDropSource() given the explicit ImGuiDragDropFlags_SourceAllowNullID flag.
omar2017-10-29 23:10:44 +01:00
acf78da742
Drag and drop: moved to imgui.h
omar2017-10-29 21:37:14 +01:00
b5f714e9f9
Drag and Drop: made BeginDragDropSource() clear the IsItemHovered() by default, added a flag to keep it.
omar2017-10-29 21:31:49 +01:00
c5536e49ef
Drag and drop API experiment
omar2017-10-29 21:15:02 +01:00
36f00811b9
Examples: Comments to guide people unfamiliar with the librairies used.
omar2017-10-28 19:28:22 +02:00
cb38caeda4
Examples: Added more comments near the fonts loading section, to catch common questions and errors (e.g. #1397, #1366, #1341, #1222, #1193, #1115, #951, etc.)
omar2017-10-28 18:21:44 +02:00
17dd8e7c30
Merge branch 'master' into navigation
omar2017-10-27 23:01:54 +02:00
b9ebb34a04
Nav: ColorButton: Fixed a case of not using local 'hovered' flag directly, messes with some of my drag and drop work, and I can't find/understand the reason why this was left as is (there _was_ a reason at the time but it appears to be obsolete now?)
omar2017-10-27 20:54:48 +02:00
f962ca0b01
ColorTooltip: Resize ColorButton to align better with text, now that ColorButton provides a text baseline (0260fdd1c6)
omar2017-10-27 20:36:51 +02:00
d55b69ad6e
Styles: Nav tweaks.
omar2017-10-27 20:06:45 +02:00
edafbcd630
Merge branch 'master' into navigation
omar2017-10-27 20:04:51 +02:00
c503a50cff
Styles: Moved Classic colors code to imgui_draw.cpp. Sneakily added a StyleColorsDark() function.
omar2017-10-27 20:01:30 +02:00
77df1ba9e0
Version 1.53 WIP
omar2017-10-27 19:54:56 +02:00
b422f35872
IO: Tracking extra mouse dragging data which is convenient for implementating various manual drag and drop patterns.
omar2017-10-27 18:21:30 +02:00
c0b366b316
Merge branch 'master' into navigation
omar2017-10-27 17:27:53 +02:00
3b83cd24f5
Begin: Moved some code inside of the big if (first_begin_of_the_frame) scope
omar2017-10-27 13:16:37 +02:00
3656f2c769
NewFrame: Allow MovedWindow setting the ImGuiWindowFlags_NoInputs after moving has started in order to be able to detect windows below it, which is useful for e.g. docking mechanisms.
omar2017-10-25 22:04:31 +02:00
a6edd10ee6
NewFrame: Removed unnecessary call to FindHoveredWindow() and simplified code (went through this multiple times, hopefully haven't broken anything)
omar2017-10-25 22:02:06 +02:00
6243252d5a
Internal: BeginTooltipEx() in imgui_internal.h
omar2017-10-27 16:21:12 +02:00
f10a1d7b9e
Merge branch 'master' into navigation
omar2017-10-27 15:53:59 +02:00
d42f6bb6cc
Merged a bit of code from Navigation branch to ease further merging (InnerRect is currently not required in the Master branch)
omar2017-10-27 15:52:45 +02:00
c432fcf2bb
Minor renaming.
omar2017-10-27 12:01:52 +02:00
a6ff14d66e
Exposed IM_ARRAYSIZE() in imgui.h
omar2017-10-26 16:12:53 +02:00
c5027d4fa1
Examples: Extra clarification for the 100th person who insist on using the OpenGL2 code in spite of existing documentation leaning against it. (#1394)
omar2017-10-25 20:55:15 +02:00
549f9e3f03
Merge branch 'master' into navigation
omar2017-10-25 16:37:10 +02:00
daef33e268
Comments about mouse setup and clearing HoveredWindow when mouse down isn't owned by imgui (will affect some future hovered test and drag'n drop patterns) (#143, #1382, #1392)
omar2017-10-25 11:01:41 +02:00
4faf99eff5
Added most basic form of Disabled flag to disable interactions (but visuals aren't altered), in imgui_internals.h, undocumented/unsupported (#211, #1012)
omar2017-10-25 09:28:54 +02:00
fc25881207
Merge branch 'master' into navigation
omar2017-10-24 21:13:24 +02:00
efcd53a0c3
Removed direct dependency on sprintf() in imgui.cpp (#1038) (NB: imgui_demo stills uses it)
omar2017-10-24 20:57:41 +02:00
1f3372b7f1
ImFormatString, ImFormatStringV(): clarifying specs so that passing a NULL buffer should return the desired length. (#1038)
omar2017-10-24 20:48:29 +02:00
8fd5620277
Renamed IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCS/IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCS to IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS/IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS for consistency. (ref #238, #520, #738)
omar2017-10-24 20:23:42 +02:00
7d2cd0e6ff
Added IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS support in imconfig.h (#1038)
omar2017-10-24 20:19:32 +02:00
d2c65aa3e8
Examples: DirectX9/10/11: Tweak usage of SetCapture/ReleaseCapture. (#1375) ps: DirectX 12 example (#302) may want to adopt that as well.
omar2017-10-24 14:48:00 +02:00
0260fdd1c6
ColorButton: As a small convenience, provide a text baseline.
omar2017-10-24 12:10:37 +02:00
e9ff7162bc
ColorButton: Fixed rendering color button with a checkerboard if the transparency comes from the global style.Alpha and not from the actual source color.
omar2017-10-24 10:43:41 +02:00
