omar
3f5b2a3fe3
Exposed ImDrawCornerFlags, replaced occurences of ~0 with an explicit ImDrawCornerFlags_All. Inversed BotLeft (prev 1<<3, now 1<<2) and BotRight (prev 1<<2, now 1<<3).
2017-11-20 13:53:16 +01:00
omar
7f447c8270
Color picker: Tweak vertex shading code, since we aren't shading between PrimReserve and PrimVert the code can be expressed more naturally. ( #346 )
2017-11-20 13:16:57 +01:00
omar
dc2768503f
Fix for drag and drop branch.
2017-11-19 16:24:17 +01:00
omar
92212b17aa
Merge branch 'master' into drag_and_drop
2017-11-19 16:23:37 +01:00
omar
9848a7023b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
2017-11-19 16:21:21 +01:00
omar
abbf836fd0
Style, Begin: removed ImGuiWindowFlags_ShowBorders window flag. Borders are now fully set up in the ImGuiStyle structure (see e.g. style.FrameBorderSize, style.WindowBorderSize). Use ImGui::ShowStyleEditor() to look them up. ( #707 , fix #819 , #1031 , ref #1019 , ref #447 )
2017-11-19 15:56:51 +01:00
omar
c433bc971f
Reorder fields for consistency.
2017-11-19 14:58:10 +01:00
omar
39137ccc3e
Style: renamed ImGuiCol_ChildWindowBg to ImGuiCol_ChildBg. ( #707 )
2017-11-19 13:52:40 +01:00
omar
9a44d447cd
NewFrame() now asserts if neither Render or EndFrame have been called. Exposed EndFrame(). Made it legal to call EndFrame() more than one. ( #1423 etc.)
2017-11-19 12:06:45 +01:00
omar
538a704143
NewFrame(): using literal strings in the most-frequently firing IM_ASSERT expression to increase the odd of programmers seeing them (especially those who don't use a debugger).
2017-11-19 12:00:07 +01:00
omar
d211a0e338
Merge branch 'master' into navigation (with style breakable)
...
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
2017-11-19 00:39:37 +01:00
omar
4022ada843
Merge branch 'master' into drag_and_drop
2017-11-19 00:36:32 +01:00
omar
8a7f03cbf9
Combo: Offset popup position by border size so that a double border isn't so visible. ( #707 )
2017-11-19 00:29:59 +01:00
omar
d7af1a218e
Style: Added PopupRounding setting. ( #1112 )
2017-11-19 00:29:29 +01:00
omar
067605052d
Fix IsItemHovered() returning true for non-title bar hidden items that are clipped due to window collapsing logic. Fix 27fd1b913b. ( #823 )
2017-11-19 00:29:29 +01:00
omar
6f7b1bf2e1
Internals: Renamed ImGuiWindow::Accessed to WriteAccessed.
2017-11-19 00:29:29 +01:00
omar
58345b11e1
Style: Removed ImGuiCol_ComboBg in favor of combo boxes using ImGuiCol_PopupBg for consistency. ( #707 )
2017-11-18 23:44:16 +01:00
omar
29e0078b66
Internals: Window minor internal renaming + added WindowRounding latch.
2017-11-18 19:06:11 +01:00
omar
bd4bc929ce
Style: renamed style.ChildWindowRounding to style.ChildRounding, ImGuiStyleVar_ChildWindowRounding to ImGuiStyleVar_ChildRounding.
2017-11-18 18:28:21 +01:00
omar
da2be7bbdc
Style: ScaleAllSizes() helper rounds down every values so they are aligned on integers.
2017-11-17 21:29:37 +01:00
omar
834fa52c8e
Columns: Added ImGuiColumnsFlags_GrowParentContentsSize to internal API to restore old content sizes behavior. ( #1444 , #125 )
2017-11-16 17:34:34 +01:00
omar
7746dd104c
Merge branch 'master' into drag_and_drop
2017-11-16 13:28:22 +01:00
omar
44c590393c
Merge branch 'master' into navigation
2017-11-16 13:28:10 +01:00
omar
29d962069d
Internals: Updating condition/allow flags with a function.
2017-11-16 13:28:01 +01:00
omar
4ad414c8d4
Internals: Window: Store whether the windows has a close button (we need that info for window/tabs dropping preview calculation)
2017-11-16 13:23:50 +01:00
omar
7c4be0a000
Internals: Added BringWindowToFront(), BringWindowToBack() helpers.
2017-11-16 13:11:49 +01:00
omar
6817f3a3d9
Merge branch 'master' into navigation
2017-11-15 23:44:50 +01:00
omar
e9a7e73bba
Windows with MenuBar have a larger minimum height to avoid artefacts (I fixed most of the vertical/horizontal artefacts, but the ones in rounded corners were too hard to fix).
2017-11-15 23:42:18 +01:00
omar
f36037b384
Menu: Fixed minor rendering issues on the right size with rounded window when resizing a window small.
2017-11-15 23:38:17 +01:00
omar
9b82d9fbef
Scrollbar: Minor graphical fix for when scrollbar don't have enough visible space to display the full grab.
2017-11-15 23:14:23 +01:00
omar
f5bdf443c9
Minor comments, tweaks
2017-11-15 22:37:43 +01:00
omar
5ea6e80da1
Make it possible to use SetNextWindowPos() on a child window. Useful internally.
2017-11-15 22:23:33 +01:00
omar
44b761b308
Merge branch 'master' into drag_and_drop
2017-11-15 14:41:27 +01:00
omar
27fd1b913b
Made it guaranteed by API that after calling Begin() the last Item represent the title bar. ( #823 )
2017-11-15 14:35:45 +01:00
omar
ae060b1d67
Merge branch 'master' into drag_and_drop
2017-11-15 10:24:54 +01:00
omar
64031852de
Merge branch 'master' into navigation
2017-11-14 23:17:58 +01:00
omar
64e79035d5
Scrollbar flicker fix for menus/popups (fixes 4d00dd8326 and 2df8fa95df). Hopefully right this time.
2017-11-14 23:17:28 +01:00
omar
6001d9c7a4
Columns: Clipping columns borders on Y axis on CPU because some GPU drivers appears to be unhappy with triangle spanning large regions (not sure why tbh). ( #125 )
...
Demo: Columns: Adding a billion of extra lines and using clipper.
2017-11-14 22:41:54 +01:00
omar
ffad688fc8
Drag and Drop: Added payload->IsPreview() to user can render their custom preview while handling overlapping drop targets. ( #143 )
2017-11-14 22:11:43 +01:00
omar
852ece3a0e
Fixed build ( 3e06450d27 not meant for master branch, but ok)
2017-11-13 16:04:03 +01:00
omar
2275cb8b83
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-11-13 15:19:43 +01:00
omar
3e06450d27
Internals: Added ArrowButton() helper.
2017-11-13 15:18:31 +01:00
omar
7908cce25f
Drag and Drop: Added internal BeginDragDropTargetCustom() convenient to avoid submitting dummy ItemAdd. ( #143 )
2017-11-13 15:17:41 +01:00
omar
4d00dd8326
Fixed scrollbar flickering on/off when uncollapsing a window (fixes 2df8fa95df)
2017-11-13 15:15:48 +01:00
omar
30bf40195b
io.OptNoCursorBlink -> io.OptCursorBlink ( #1427 )
2017-11-12 16:06:44 +01:00
omar
669498ff26
Added io.OptNoCursorBlink option to disable cursor blinking. ( #1427 ). Renamed io.OSXBehaviors to io.OptMacOSXBehaviors. Should affect users as the compile-time default is usually enough. ( #473 , #650 )
2017-11-12 16:03:09 +01:00
Branimir Karadžić
9daac64ff8
Clean g.WindowsById storage on shutdown.
2017-11-11 10:01:50 +01:00
omar
06075f20ba
Merge branch 'master' into navigation
2017-11-10 11:42:08 +01:00
omar
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.
2017-11-10 11:38:01 +01:00
omar
8451855a30
ButtonBehavior: Fixed ImGuiButtonFlags_AllowOverlapMode to avoid temporarily activating widgets on click before they have been correctly double-hovered. ( #319 , #600 )
2017-11-09 20:20:02 +01:00
omar
4b94738c7e
Drag and Drop: Drop target rectangle goes out of clipping range ( #143 )
2017-11-09 20:18:17 +01:00
omar
b1653cd361
Drag and Drop: Allow NULL payload (since type only can be useful). ( #143 )
2017-11-09 20:18:05 +01:00
omar
a297cbafdb
Merge branch 'master' into navigation
2017-11-08 23:17:14 +01:00
omar
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...
2017-11-08 23:17:08 +01:00
omar
a4cc3d4637
Minor tweaks/comments. Note that the reordering the one subtraction caused subtle havoc before the patch in 9ac8820ee2.
2017-11-08 22:36:31 +01:00
omar
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.
2017-11-08 22:32:22 +01:00
omar
b6504b8eee
Drag and drop: Handle overlapping drag target priorities given their surface, which appears to make most sense for drag and drop operations.
2017-11-08 15:47:52 +01:00
omar
2ab27be3de
Child window with MenuBar use regular WindowPadding.y so layout look consistent in child or in a regular window.
2017-11-07 22:23:20 +01:00
omar
41862b8c0e
ButtonBehavior: Fixed ImGuiButtonFlags_NoHoldingActiveID from incorrectly setting ActiveIdClickOffset, which probably have no known effect, but it is more correct this way. ( #1418 )
2017-11-07 16:41:58 +01:00
omar
1870738880
LowerBound() minor tweaks
2017-11-07 14:05:48 +01:00
omar
571b08f315
Internal: FindWindowByName() faster and doesn't touch every windows
2017-11-07 13:59:55 +01:00
omar
2c7ba21417
Fixed auto-resize allocating too much space for scrollbar when SizeContents is bigger than maximum window size (fixes c0547d358d) ( #1417 )
2017-11-07 11:37:38 +01:00
omar
0d4c320f88
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
2017-11-06 23:58:28 +01:00
omar
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.
2017-11-06 23:55:40 +01:00
omar
de1e7dc088
Drag and Drop: Moved internal fields out of public sight. ( #143 )
2017-11-06 20:04:10 +01:00
omar
8b725c94cb
Drag and Drop: Rework internal to allow overlapping targets ( #143 )
2017-11-06 19:39:23 +01:00
omar
16a5da9521
RenderTriangle() minor tweak to align Left/Right and Up/Down arrow extents visually
2017-11-03 20:20:25 +01:00
omar
553bdeedf7
Drag and Drop: Made it legal to not call SetDragDropPayload() between BeginDragDropSource() and EndDragDropSource(). ( #143 )
2017-11-02 18:30:46 +01:00
omar
3461a2f296
Merge branch 'master' into drag_and_drop
2017-11-02 18:06:04 +01:00
omar
982ce50b37
IsWindowHovered() returns true when moving window ( #1382 , #1404 )
2017-11-02 16:44:32 +01:00
omar
ff4d4ca651
IsWindowHovered(): Added ImGuiHoveredFlags_FlattenChilds flag. Made IsRootWindowOrAnyChildHovered() obsolete in favor of IsWindowHovered( ImGuiHoveredFlags_FlattenChilds) ( #1382 , #1404 )
2017-11-02 16:44:24 +01:00
omar
803ac3a5c6
IsWindowHovered() Fix behavior when an item is active to use the same logic as IsItemHovered() ( #1382 , #1404 )
2017-11-02 16:23:03 +01:00
omar
66f42324ad
Drag and Drop: Added ImGuiDragDropFlags_SourceNoHoldToOpenOthers flag.
2017-11-01 17:25:42 +01:00
omar
63f6f2dd13
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-11-01 15:09:23 +01:00
omar
6ab20ff9bf
Minor tweaks to the user guide.
2017-11-01 12:33:58 +01:00
omar
e55caf0b95
Merge pull request #1402 from elect86/patch-1
...
Minor fix typo
2017-10-30 09:51:49 +01:00
omar
7f06d385a1
Added assertions and comments for incorrect use/understanding of IsWindowFocused() etc. functions
2017-10-30 09:50:54 +01:00
Giuseppe Barbieri
9e3f9fc2dd
Update imgui.cpp
2017-10-30 09:35:42 +01:00
omar
5956fff7e2
Drag and Drop: ImGuiButtonFlags_PressedOnDragDropHold focuses the target window.
2017-10-30 00:10:05 +01:00
omar
a810619555
Drag and Drop: Added support for drag and drop hold-long-to-open for CollapsingHeader() and TreeNode(). Open only!
2017-10-30 00:03:04 +01:00
omar
1d7d8f8574
Merge branch 'master' into drag_and_drop
2017-10-29 23:49:24 +01:00
omar
b13d281356
Maintaining ActiveIdTimer and HoveredIdTimer (the later is useful for drag and drop, both will be of course for creators of custom widgets)
2017-10-29 23:49:01 +01:00
omar
d46772b429
Comments
2017-10-29 23:14:17 +01:00
omar
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.
2017-10-29 23:10:44 +01:00
omar
b5f714e9f9
Drag and Drop: made BeginDragDropSource() clear the IsItemHovered() by default, added a flag to keep it.
2017-10-29 21:31:49 +01:00
omar
c5536e49ef
Drag and drop API experiment
2017-10-29 21:15:02 +01:00
omar
17dd8e7c30
Merge branch 'master' into navigation
2017-10-27 23:01:54 +02:00
omar
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?)
2017-10-27 20:54:48 +02:00
omar
f962ca0b01
ColorTooltip: Resize ColorButton to align better with text, now that ColorButton provides a text baseline ( 0260fdd1c6)
2017-10-27 20:36:51 +02:00
omar
edafbcd630
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-10-27 20:04:51 +02:00
omar
c503a50cff
Styles: Moved Classic colors code to imgui_draw.cpp. Sneakily added a StyleColorsDark() function.
2017-10-27 20:01:30 +02:00
omar
77df1ba9e0
Version 1.53 WIP
2017-10-27 19:54:56 +02:00
omar
b422f35872
IO: Tracking extra mouse dragging data which is convenient for implementating various manual drag and drop patterns.
2017-10-27 18:21:30 +02:00
omar
c0b366b316
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
2017-10-27 17:27:53 +02:00
omar
9f200d10d5
Version 1.52
2017-10-27 17:10:41 +02:00
omar
cc78e9a213
Merge branch 'master' into navigation
2017-10-27 16:46:03 +02:00
omar
267ea506de
Begin: Fix for unused "Debug" (fix for 3b83cd24f5 )
2017-10-27 16:45:56 +02:00
omar
5afee1c6f3
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
2017-10-27 16:42:06 +02:00
omar
3b83cd24f5
Begin: Moved some code inside of the big if (first_begin_of_the_frame) scope
2017-10-27 16:39:55 +02:00
omar
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.
2017-10-27 16:39:23 +02:00
omar
a6edd10ee6
NewFrame: Removed unnecessary call to FindHoveredWindow() and simplified code (went through this multiple times, hopefully haven't broken anything)
2017-10-27 16:38:14 +02:00
omar
6243252d5a
Internal: BeginTooltipEx() in imgui_internal.h
2017-10-27 16:21:12 +02:00
omar
f10a1d7b9e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-10-27 15:53:59 +02:00
omar
d42f6bb6cc
Merged a bit of code from Navigation branch to ease further merging (InnerRect is currently not required in the Master branch)
2017-10-27 15:52:45 +02:00
omar
c432fcf2bb
Minor renaming.
2017-10-27 12:01:52 +02:00
omar
549f9e3f03
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
2017-10-25 16:37:10 +02:00
omar
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 )
2017-10-25 11:01:41 +02:00
omar
4faf99eff5
Added most basic form of Disabled flag to disable interactions (but visuals aren't altered), in imgui_internals.h, undocumented/unsupported ( #211 , #1012 )
2017-10-25 09:28:54 +02:00
omar
fc25881207
Merge branch 'master' into navigation
2017-10-24 21:13:24 +02:00
omar
efcd53a0c3
Removed direct dependency on sprintf() in imgui.cpp ( #1038 )
...
(NB: imgui_demo stills uses it)
2017-10-24 20:57:41 +02:00
omar
1f3372b7f1
ImFormatString, ImFormatStringV(): clarifying specs so that passing a NULL buffer should return the desired length. ( #1038 )
2017-10-24 20:48:29 +02:00
omar
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 )
2017-10-24 20:23:42 +02:00
omar
7d2cd0e6ff
Added IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS support in imconfig.h ( #1038 )
2017-10-24 20:19:32 +02:00
Patrick Doane
70cb427469
Add missing CloseClipboard call
2017-10-24 20:12:42 +02:00
omar
d513546325
Merge branch 'master' into navigation
2017-10-24 15:49:01 +02:00
omar
5b062c4c29
Fixed typos
2017-10-24 15:26:04 +02:00
omar
0260fdd1c6
ColorButton: As a small convenience, provide a text baseline.
2017-10-24 14:38:32 +02:00
omar
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.
2017-10-24 10:43:41 +02:00
omar
97bf2131e2
Fixed calling SetNextTreeNodeOpen() on a collapsed window leaking to next frame.
2017-10-23 14:37:47 +02:00
omar
20983773f1
Nav: MainMenuBar now releases focus when user gets out of the menu layer. WindowingTarget when applying focus to a window with only menus automatically sets the layer. ( #787 )
...
This is enough for basic mouse/gamepad usage, but 1- previous window gets an unfocused title bar color temporarily, 2- generaly for gamepad and especially keyboard we need much more to get this done right
2017-10-23 12:38:39 +02:00
omar
025d4f0c97
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-10-23 12:34:46 +02:00
omar
e7922b3fa0
Factorized some code (+ declared as static function without namespace, a pattern with the Nav branch has started to use)
2017-10-23 12:34:15 +02:00
omar
2ef2c104a1
Begin: Minor tweaks
2017-10-23 11:36:43 +02:00
omar
be12f8c55d
Nav: Fixed handling of ImGuiNavInput_KeyMenu so it doesn't set g.NavWindowingTarget at all, reducing size effects + handling menu layer toggle on Alt Release ( #787 )
2017-10-23 11:26:52 +02:00
omar
6f0aa766e1
Nav: Added internal ImGuiNavReadMode_Released test for key releases.
2017-10-23 11:26:30 +02:00
omar
d769e2515a
Merge branch 'master' into navigation
2017-10-23 10:05:36 +02:00
omar
1bc1751670
MenuItem(): Tweaks to mimic exact spacing of BeginMenu() when inside a menu bar, which is a little misleading imho but may be useful. ( #1387 )
2017-10-22 10:56:37 +02:00
omar
b177f2432d
MenuItem(): Tweak to not draw over all horizontal space when in horizontal layout mode. ( #1387 )
2017-10-22 10:36:22 +02:00
omar
5fa81f2a26
Nav: Added ImGuiNavInput_KeyMenu aside from ImGuiNavInput_PadMenu as it is one differenciator between pad and keyboard that's very annoying with the keyboard.
...
Remove the move/resize behavior that appears than holding the button for a while. (#787 )
2017-10-20 22:12:10 +02:00
omar
1c5b3fb1d2
Merge branch 'master' into navigation
2017-10-20 21:17:57 +02:00
omar
f7259e60ee
Comments
2017-10-20 21:17:51 +02:00
omar
23b9060468
Nav: Honoring ImGuiItemFlags_NoNav which is used by color picker ( #787 )
2017-10-20 20:35:39 +02:00
omar
e4bb9102f9
Merge branch 'master' into navigation
2017-10-20 20:32:17 +02:00
omar
6ab737a4bb
Popups: Fixed right-click to close popups not handling modal windows properly. (~#439)
2017-10-20 20:31:01 +02:00
omar
aca23fd3f0
Popups: similarly to previous commit, we fix reopening a popup within a popup stack from truncating the whole stack. This is done by properly refocusing the lower level popup. (~#439)
2017-10-20 19:25:34 +02:00
omar
59a89774d7
Popups: fixed CloseInactivePopups() so that right-clicking to close one level of popups in a popups stack won't close the whole stack. This is done by properly refocusing the lower level popup. Fixes 87ae40843c (~#439)
2017-10-20 19:24:12 +02:00
omar
43df7eb5ea
Added OpenPopupOnItemClick(); helper which mimic BeginPopupContextItem() but doesn't do the open.
...
Made the color popups uses this standard function so they handle reopening a context menu.
2017-10-20 18:56:31 +02:00
omar
0ea66dc260
Fixed bad merge from Master
2017-10-20 18:16:53 +02:00
omar
1172ff62e1
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
2017-10-20 18:10:07 +02:00
omar
3cc10d25a9
BeginPopupContextItem(), BeginPopupContextWindow(): Using newly introduced IsItemHovered() flags to allow reopening another context menu (over same or not same item) with right-click. ( #439 ) (+1 squashed commits)
2017-10-20 18:02:52 +02:00
omar
695ea45fca
IsWindowHovered(): Changed default behavior to now return false is a widget from another window is active + Added support for ImGuiHoveredFlags_AllowWhenBlockedByActiveItem. (relate to drag'n drop idoms: #143 )
2017-10-20 17:59:48 +02:00
omar
564ff2dfd3
IsItemHovered(), IsWindowHovered(): added flags to enable various and more specific behavior. Will enable improvements for popups/context menus and drag'n drop. (relate ~#439, #1013 , #143 , #925 )
...
The legacy confusing IsItemRectHovered(), IsWindowRectHovered() can be completely removed now.
Changed IsWindowHovered() behavior with default parameter: it now return false is the window is blocked by a popup.
Demo: Added tests for those two functions.
2017-10-20 17:52:22 +02:00
omar
d29a6a5a5a
Moved IMGUI_DISABLE_OBSOLETE_FUNCTIONS block lower in the imgui.h file so obsolete functions can use flags. Also sane to quarantine them outside of the respectable area.
2017-10-20 17:29:52 +02:00
omar
e6f06627e9
Made the ImGuiWindowFlags_NoMove flag inherited from parent to child, so in a setup with RootWindow (no flag) -> Child (NoMove flag) -> SubChild (no flag) user won't be able to move the root window by clicking on SubChild. ( #1381 )
2017-10-20 16:13:13 +02:00
omar
3b485cda51
Fixed a bug allowing to move a _NoMove window from a child that doesn't have the flag. ( #1381 )
...
broken by e56eba44fe#1337 )
2017-10-20 16:09:24 +02:00
omar
87ae40843c
Popups: popups can be closed with a right-click anywhere, without altering focus under the popup.(~#439)
2017-10-20 13:26:39 +02:00
omar
853018dd4d
Popups: Fixed a bug introduced in 1a35766356 which made the BeginPopupContextXXX functions create popups without border. (nb: all that border mess is going away in styling clean up)
2017-10-20 13:21:42 +02:00
omar
5f7299e15a
Refactor EndFrame() code that process focusing window with left mouse button. This commit should be no-op.
2017-10-20 13:07:57 +02:00
omar
51eed2f257
Merge branch 'master' into navigation
2017-10-19 19:42:27 +02:00
omar
5b699517d4
Internals: PaintVerts** renamed to ShadeVerts**, moved to imgui_draw.cpp and exposed in imgui_internal.h (+1 squashed commits)
2017-10-19 19:42:19 +02:00
omar
22977ffedb
Documentation: Extra comments + tweaks to make usage of long-line more bearable.
2017-10-19 19:30:46 +02:00
omar
938f1b720f
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-10-19 00:04:53 +02:00
omar
370a48c10b
Internals: RenderCollapseTriangle() -> RenderTriangle(), takes a ImGuiDir
2017-10-18 23:46:16 +02:00
omar
a03093b2d4
CollapsingHeader(bool*) variant: fixed for IsItemHovered() to work properly in the nav branch.Basically the close button now has to use ItemAdd() to be navable into, which overwrite the IsItemHovered data. ( #600 , #787 )
2017-10-18 19:55:08 +02:00
omar
29a652adee
CollapsingHeader(bool*) variant: fixed for IsItemHovered() to work properly in the nav branch.Basically the close button now has to use ItemAdd() to be navable into, which overwrite the IsItemHovered data. ( #600 , #787 )
2017-10-18 19:51:32 +02:00
omar
a126c702d9
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
2017-10-18 13:09:28 +02:00
omar
ef3f87eec5
Internals: ButtonBehavior: made ImGuiButtonFlags_PressedOnClick and ImGuiButtonFlags_PressedOnDoubleClick set the click offset correctly + hold on g.ActiveId so Held state can be reported. Added ImGuiButtonFlags_NoHoldingActiveId flag to disable the later.
2017-10-18 13:08:25 +02:00
omar
bf778ebb7e
Checkbox: Using checkmark. MenuItem: Tweaked checkmark, thicker.
2017-10-18 13:06:49 +02:00
omar
d96b6ecf88
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
2017-10-17 16:20:35 +02:00
omar
03b76bf05b
Begin: Marked 5 parameters version of Begin() as obsolete. Now waiting for a riot to happen!
2017-10-17 16:19:21 +02:00
omar
78a85ba3fe
Begin: Work toward obsoleting the 5-arguments Begin() overload. Internal BeginEx() becomes the normal public Begin() again! (4)
2017-10-17 16:15:46 +02:00
omar
2739b6ebcd
Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed bg_alpha from internal BeginEx(). (3)
2017-10-17 16:14:20 +02:00
omar
4aa9d2089d
Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed size_on_first_use from internal BeginEx(). (2)
2017-10-17 15:51:20 +02:00
omar
55d873875e
Begin: Work toward obsoleting the 5-arguments Begin() overload. (1)
2017-10-17 15:47:55 +02:00
omar
1a35766356
BeginPopupContextItem() now supports a NULL string identifier and uses the last item ID if available. For interactive items (that have an ID) this works! For non interactive items we assert.
2017-10-16 23:37:12 +02:00
omar
c76f014292
Fix IsItemHovered() issue on child by temporarily reverting 344d48be31. This is not the ideal solution. ( Fix #1370 )
2017-10-16 16:41:09 +02:00
omar
af565ea828
Nav: InputTextMultiline: Fixed navigation/selection. Disabled selecting all when activating a multi-line text editor. ( #787 )
2017-10-16 02:41:28 +02:00
omar
7ea52ac1e4
Nav: InputTextMultiline: Fixed navigation/selection. Disabled selecting all when activating a multi-line text editor. ( #787 )
2017-10-16 02:30:59 +02:00
omar
82a27fd3aa
Nav: InputText: Fixed using Up/Down history callback feature when Nav is enabled ( #787 )
2017-10-16 02:06:42 +02:00
omar
b70c2fa887
Nav: Internals: Moved some internal code to namespace, comments
2017-10-16 00:46:23 +02:00
omar
ae1866c424
Nav: NavProcessItem() updates current NavLayer. Basically we're hearing toward rebuilidng nav info from an id. ( #787 ).
2017-10-16 00:38:42 +02:00
omar
97851f7376
Nav: NavProcessItem() computes window-relative rectangle using own Window rather than NavWindow. Not sure what it may mean for child-flattened-nav (disabled). ( #787 )
2017-10-16 00:36:31 +02:00
omar
7d14262202
Nav: SetFocusID() update NavWindow and NavRectRel just as we get them. Needed by upcoming commit, committing separately as I'm curious if it has any side-effect. ( #787 )
2017-10-16 00:33:30 +02:00
omar
83416fa5da
Merge branch 'master' into navigation
2017-10-15 21:28:17 +02:00
omar
d761825cfb
Nav: Renaming a field + Comments.
2017-10-15 17:57:15 +02:00
omar
ce7b04e8b9
Removed apparently unncessary code in InputFloatN() and InputInt().
2017-10-13 23:59:17 +02:00
omar
db5f1b79cd
Nav: ButtonBehavior() keep _displaying_ NavId item as howered when refocusing or moving window, which is consistent with IsItemHovered() and reduce noise/flicker ( #787 )
2017-10-13 19:18:59 +02:00
omar
c42baf392a
Reluctantly exposed GetActiveID(), GetHoveredID() in imgui_internal because the demo code will need it.
2017-10-13 16:48:14 +02:00
omar
53780a4fcc
Nav: Shallow tweaks.
2017-10-13 16:23:44 +02:00
omar
f852b9a52a
Exposed Scrollbar() in imgui_internal.h and removed a bool arg
2017-10-13 13:31:34 +02:00
omar
b667d5a9e7
Nav: Internals: Renamed ImGuiButtonFlags_NoNavOverride to ImGuiButtonFlags_NoNavFocus + fixed a theorically missing test in ButtonBehavior() ( #787 )
2017-10-13 13:31:34 +02:00
omar
0371219222
Nav: Internals: Renamed SetActiveIDNoNav -> SetActiveID() and old SetActiveID() -> SetFocusID(), both functions needs to be called when both are desirabled. ( #787 )
...
May break code relying on imgui_internal.h, relying on nav and not calling ButtonBehavior().
2017-10-13 13:31:34 +02:00
omar
8b095e483b
Internals: Moved SetNavID() and renamed casing to be consistent with stuff exposed in imgui_internal.h
2017-10-13 13:31:34 +02:00
omar
4be967823f
Exposed Scrollbar() in imgui_internal.h and removed a bool arg
2017-10-13 13:30:28 +02:00
omar
48498b337d
Internals: SetActiveID window cannot be NULL
2017-10-13 13:07:07 +02:00
omar
4548bcb5c9
Nav: commiting shallow bits to reduce noise from working copy/upcoming commit.
2017-10-12 02:09:13 +02:00
omar
17519c313a
Nav: Extract part of NavUpdate() into a saner NavUpdateWindowingTarget() ( #787 )
2017-10-11 20:47:41 +02:00
omar
b05b31e690
Nav: Made NavWindow always refresh from NavId so we can lazily retrieve the window for user functions that don't have it. This is not required by current commit but I'd rather test it earlier. Idea: eventually if we switch to 64-bit identifiers we could reserve e.g. 20 bits to store a simplified window identifier so we can always retrieve a window from an id. ( #787 )
2017-10-11 20:37:45 +02:00
omar
f0d437dd9c
Nav: SetActiveId() uses SetActiveIDNoNav() to avoid duplicating logic. ( #787 )
2017-10-11 20:29:53 +02:00
omar
2047c58efb
Nav: Extract part of NavUpdate() into a saner NavScrollToBringItemIntoView() ( #787 )
2017-10-11 20:28:16 +02:00
omar
7a14d7dfdc
Nav: More consistently drawing a (thin) navigation rectangle hover filled frames such as tree nodes, collapsing header, menus. ( #787 )
2017-10-11 19:05:36 +02:00
omar
3833f1f7a2
Merge branch 'master' into navigation
2017-10-11 15:38:33 +02:00
omar
43b4a81b3e
Rnamed AlignFirstTextHeightToWidgets() to AlignTextToFramePadding(). Kept inline redirection function (will obsolete).
2017-10-11 15:36:57 +02:00
omar
c6e370a77a
TreeNode: Added ImGuiTreeNodeFlags_FramePadding flag
2017-10-11 15:16:11 +02:00
omar
69dd895358
Nav: Renaming NavInitDefaultRequest -> NavInitRequest
2017-10-06 15:54:29 -07:00
omar
4d83078885
Nav: Moving code next to its peers
2017-10-06 15:50:32 -07:00
omar
d2975115cd
Nav: Caching into g.NavAnyRequest to minimize hot path cost (and so we can add many more request sources)
2017-10-06 15:14:28 -07:00
omar
d91b093be6
Nav: Minor tweaks in NavProcessItem() used by ItemAdd()
2017-10-06 14:56:25 -07:00
omar
c3105919ba
Nav: Minor tweaks also toward removing processing from ItemAdd()
2017-10-06 14:51:15 -07:00
omar
d16309ca77
Internal: ItemAdd() minor shallow tweaks
2017-10-06 14:40:53 -07:00
