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
omar
64ce83b9ed
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-10-06 14:27:29 -07:00
omar
042153d254
Internal: ItemAdd(), IsClippedEx(): removed unnecessary indirection for ID parameter
2017-10-06 14:23:18 -07:00
omar
acb6f12d2c
Removed extraneous calls to GetCurrentWindowRead() when we already have a ImGuiContext. Internal RenderXXX functions also don't need to write into the Accessed field at all.
2017-10-06 11:48:07 -07:00
omar
6e1199c603
Merge branch 'master' into navigation
2017-10-06 11:24:58 -07:00
omar
f451785c9e
Nav: Shuffled code in ItemAdd() so that NavProcessItem() may have access to LastItemId (will be required by tabbing)
2017-10-06 10:17:01 -07:00
omar
e12cfa9dfd
Nav: Minor midying up and comments,
2017-10-06 09:44:50 -07:00
omar
40df7a5155
Nav: Removed possibly redundant test prior to calling NavProcessItem() from ItemAdd()
2017-10-06 09:40:13 -07:00
omar
a77dd02e8a
Nav: Moving code next to its peers
2017-10-05 22:06:46 -07:00
omar
f5bd4663dd
Nav: Moving the big chunk of code from ItemAdd() to NavProcessItem()
2017-10-05 22:02:13 -07:00
omar
59c6f35bf6
Added ActivateItem(), GetItemID() functions.
2017-10-05 21:34:01 -07:00
omar
80c4e2fe7b
Nav: Tidying up activation mechanism so that setting NavActivateId can trigger buttons.
2017-10-05 21:27:08 -07:00
omar
d851775c80
ColorButton: Reduced bordering artefact that would be particularly visible with opaque Col_FrameBg and FrameRounding enabled.
2017-10-05 17:55:27 -07:00
omar
726dcf0dd2
TextUnformatted(): minor tweak
2017-10-05 11:03:38 -07:00
omar
a0d724b450
Made AlignFirstTextHeightToWidgets() saner and faster (still disliking its name very much!)
2017-10-05 11:02:23 -07:00
omar
a3d0755181
Merge branch 'master' into navigation
2017-10-05 10:31:37 -07:00
omar
f326fac64a
Nav: Menus and popups now have move request wrap around vertically (using the move request forward thing added recently). ( #787 )
2017-10-05 10:29:17 -07:00
omar
a8788e51a7
SetKeyboardFocusHere() added assert to prevent passing values smaller than -1 as we may have to outlaw them (I think nobody was using that)
2017-10-05 09:53:07 -07:00
omar
63cd2bf9b1
Removed obsolete comment.
2017-10-05 09:40:06 -07:00
omar
3ddcdcf6e7
Merge branch 'master' into navigation
2017-10-04 18:46:09 -07:00
omar
67ac7da30f
Styles: Added ImGuiStyle::ScaleAllSizes(float) helper to make it easier to have application transition to e.g. High DPI with a matching style.
2017-10-04 18:13:57 -07:00
omar
a56b71e866
Nav: Added code to render thin highlight type. ( #787 )
2017-10-04 10:44:27 -07:00
matiTechno
b36a043bbf
typo
2017-10-04 11:09:21 +02:00
omar
6ea90af6b7
Nav: Highlight clipped within host window then extruded out. ( #787 )
2017-10-03 13:53:17 -07:00
omar
cb4e6c8212
Nav: Selectable(): activating selectable also sets NavId + removed the MouseDelta test (added in 43ee5d73e9, #323 ) as I don't think it is needed. ( #787 )
2017-10-03 13:44:48 -07:00
omar
64a51327d3
Nav: Added NavMoveResultParentId internal info to record when the parent/context of a given NavId. Useful for various algorithms (currently looking at range selection stuff) ( #787 )
2017-10-03 13:25:40 -07:00
omar
74da533c93
Nav: Added NavJustNavigatedId internal info to record when we land on a given item after a navigation request, useful for various algorithms (currently looking at range selection stuff) ( #787 )
2017-10-03 11:22:38 -07:00
omar
7f58bb03c1
Changed the internal name formatting of child windows to use slashes as separator, more readable.
2017-10-02 16:07:34 -07:00
omar
cbc9730798
Metrics: Draw window bounding boxes when hovering Pos/Size. List all draw layers, trimming empty commands like Render() does.
2017-10-02 16:07:33 -07:00
omar
491edfd8d8
Nav: Fixed a crash introduced yesterday.
2017-09-30 23:46:23 +02:00
omar
0046c618b0
Nav: Allow to collapse tree nodes with NavLeft and open them with NavRight ( #787 , #1079 )
2017-09-30 00:47:07 +02:00
omar
ecd72cc0c7
Nav: Disabled the final axial check when considering candidates in most situations except menubars.
...
It's definitively undesirable inside Menu as we want to catch nav request failures reliably.
I think it may be considered as an option if we find this desirable i some circumstances. Right now ideally I'd remove it totally but with current scoring setup, without it we can't easily reach the Window Close button. (#787 )
2017-09-30 00:26:55 +02:00
omar
88a354585a
Nav: It's now possible to navigate sibling of a menu-bar while navigating inside one of their child. If a Left<>Right navigation request fails to find a match we forward the request to the root menu. ( #787 , #126 )
...
Currently the sibling menu is isn't automatically opened, that's still left to it (and even that can be anoying in Windows when the first menu-item is a child menu)
2017-09-29 23:39:34 +02:00
omar
f4e4c38705
BeginMenu(): fixed logic to distinguish vertical menu from one layed out in a menu bar. Makes MenuItem() in a regular window behave more consistently, and this will be also needed by upcoming menu-navigation changes in the nav branch. ( #126 , #787 )
2017-09-29 23:37:14 +02:00
omar
9912f7eef8
BeginMenu(): fixed logic to distinguish vertical menu from one layed out in a menu bar. Makes MenuItem() in a regular window behave more consistently, and this will be also needed by upcoming menu-navigation changes in the nav branch. ( #126 , #787 )
2017-09-29 22:19:53 +02:00
omar
cf3b21179b
Nav: Comments
2017-09-29 20:03:02 +02:00
omar
5a9ebeca9e
Nav: Fix typo from 9712a81f85
2017-09-29 19:49:20 +02:00
omar
bfaa426f7f
Nav: Minor tidying up (adding local variables to be a little more sane).
2017-09-29 19:48:16 +02:00
omar
8a5a29f0be
Nav: Renamed internal field.
2017-09-29 19:28:19 +02:00
omar
9712a81f85
Nav: Rectangle rectangle stored per window and per layer as well. Makes things simpler, allows enable us to visualize more data.
2017-09-29 19:26:03 +02:00
omar
54eb4c485e
Nav: Marked misleading/broken code that will never execute.
2017-09-29 19:15:24 +02:00
omar
e3c89aeb10
Nav: Fixed menuitems/selectable on menu layer (layer 1) from storing themselves in wrong layer of LastNavIds when hovered.causing inconsistencies and bugs when hovering menu with mouse then pressing ALT to return to layer 0).
...
NB: this is not a new bug introduced by the previous commit (which is related to nav layers), bug has been there for a while. (#787 )
2017-09-29 18:24:43 +02:00
omar
9737efb2f1
Nav: Store per-window last nav id also per-layer so we can easily query them for menu navigation code. ( #787 )
2017-09-29 17:58:25 +02:00
omar
8a814487fe
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-09-29 16:30:43 +02:00
omar
fba9353c60
BeginMenu: Shuffling braces around to clarify flow
2017-09-29 16:29:00 +02:00
omar
cf308f4039
Nav: Fixed SetItemDefaultFocus from stealing default focus when we are initializing default focus for a menu bar layer ( #787 )
2017-09-29 00:20:51 +02:00
omar
f4398226cc
Nav: Support for fallback horizontal scrolling with PadLeft/PadRight (nb: fallback scrolling is only used to navigate windows that have no interactive items). ( #787 )
2017-09-29 00:01:26 +02:00
omar
30b1d85962
Nav: Commiting some better organized Debug helper because this going to stay for a bit.
2017-09-28 23:48:30 +02:00
omar
1f7f54e196
Removed extraneous test.
2017-09-28 22:00:17 +02:00
omar
df366b230e
ColorPicker4: Use nav flag to provide a slighly better experience when using navigation ( #787 , #346 )
2017-09-28 20:22:30 +02:00
omar
2d859dee4e
Nav: Added ImGuiItemFlags_NoNav item flag
2017-09-28 19:58:01 +02:00
omar
878fa96896
Nav: Re-arranged ItemAdd() to maximize early out ( #787 )
2017-09-28 19:57:24 +02:00
omar
dd0855de5c
ButtonBehavior: Tidying up.
2017-09-28 19:47:45 +02:00
omar
4b4e455c40
Nav: Internal nenaming
2017-09-28 19:41:30 +02:00
omar
e0a2a832cd
Nav: Changed internal flag to NoNavDefaultFocus to be false by allow, and more consistent ( #787 )
2017-09-28 19:18:41 +02:00
omar
af38749ea1
Nav: Fixed ButtonBehavior mistakenly setting active id when the Activate button is held and we have a new NavId, which affected browsing some popups ( #787 )
2017-09-28 19:07:52 +02:00
omar
ca4db8c905
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-09-28 17:40:25 +02:00
omar
e8f7c83138
Begin: Shallow tweak to minimize diff with nav branch
2017-09-28 17:37:55 +02:00
omar
926c1cf9a4
Merged from Navigation branch: ImGuiItemFlags_SelectableDontClosePopup flag
2017-09-28 17:02:28 +02:00
omar
f99348711b
Added VerticalSeparator() entry point in imgui_internal. Seperator() in an horizontal layout context still does that.
2017-09-28 16:41:01 +02:00
omar
9142002121
Separator(): Tweak Logging so that the separator text is aligned according to tree padding.
2017-09-28 16:40:28 +02:00
omar
d394c7ad0b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-09-28 15:45:35 +02:00
omar
0106dcbd02
Fixed IsItemHovered() - part of the processing has to be done in ItemAdd() because the widget may alter clipping rectangle temporarily.
2017-09-28 15:43:26 +02:00
omar
2a8eb618dc
Nav: Fixed NavDown to open menu from a menu bar ( #787 )
2017-09-28 00:36:58 +02:00
omar
35f65e05ed
Merge branch 'master' into navigation
2017-09-28 00:33:29 +02:00
omar
fafe65a8fc
Refactor to move the responsability of SetHovered() to ItemHoverable() - previously IsHovered(). Simpler and the parallel to ItemAdd is clearer with the new name.
2017-09-28 00:21:47 +02:00
omar
2159629e9e
Removed another msileading difference between the hovered functions (IsWindowContentHoverable() uses the root window already). Sorry for the commit spam! (making small commit to easily be able to Bisect those in case I make a mistake)
2017-09-28 00:05:35 +02:00
omar
eca74d55c7
IsItemHovered(), IsHovered(): Shallow tweaks, eventually removed all the braces.
2017-09-28 00:05:18 +02:00
omar
2b7d4c713e
Internals: Moved IsWindowContentHoverable() in the file
2017-09-27 23:31:03 +02:00
omar
c5a79deb38
IsItemHovered(), IsHovered(): Shallow tweaks to make them more symetrical. Removed one set of braces.
2017-09-27 23:10:46 +02:00
omar
7bcb1d3816
Internals: ButtonBehavior(), IsHovered() moved the responsability of flatten_child higher level to ButtonBehavior() - not super sure about the elegance of this
2017-09-27 22:59:40 +02:00
omar
79ef64430c
Nav: Fixed merge cc26db8ec7
2017-09-27 17:27:21 +02:00
omar
cc26db8ec7
Merge branch 'master' into navigation
2017-09-27 17:25:50 +02:00
omar
0adcddac39
IsItemHovered(), ItemAdd(): finishing cleaning up, moved the code to IsItemHovered() so ItemAdd() is more lightweight and the two IsXXXHovered functions are now very similar, making their differences less confusing.
2017-09-27 17:21:50 +02:00
omar
19e22baa06
ItemAdd(): more re-ordering of tests to match IsHovered() + comments
2017-09-27 17:06:07 +02:00
omar
344d48be31
IsItemHovered(), ItemAdd(): Fixed seemingly unnecessary comparaison of root windows, makes IsItemHovered() more consistent with internal IsHovered().
...
Original test was added in 6e99688fa7
2017-09-27 16:49:25 +02:00
omar
c075786d8b
ItemAdd(): re-ordering the tests, submission should now be faster.
2017-09-27 16:29:46 +02:00
omar
99c7622a1b
ItemAdd(), not performing computation for IsItemRectHovered() which does them itself, allowing us in the next commit to optimize ItemAdd() and make its logic more consistent with IsHovered().
2017-09-27 16:20:53 +02:00
omar
e87ad328e4
Moved implementation of Hovered-related functions next to each others + comments, before I attempt to work on them. No functional change here.
2017-09-27 16:07:47 +02:00
omar
869732c456
Nav: Removed unnecessary combo code (that kept the combo arrow highlighted after reverting to mouse controls). ( #787 )
2017-09-27 12:34:18 +02:00
omar
a2b2e56e8e
Merge branch 'master' into navigation
2017-09-27 12:31:12 +02:00
omar
e56eba44fe
Fixed not being able to move a window by clicking on one of its child window ( #1337 , #635 ), broken by 313d388bba
2017-09-27 12:25:40 +02:00
omar
8374a454da
Removed extraneous ImGui:: prefixes. Declared ColorEditOptionsPopup in imgui_internals.h. Tweaked internal signatures.
2017-09-27 11:39:13 +02:00
omar
bbd6d5d5b5
Combo: Cleaned up, removed unnecessary code (looks like this part went untouched for a long time!).
2017-09-27 00:20:09 +02:00
omar
8fd4beddb8
Merge branch 'master' into navigation
2017-09-26 20:28:40 +02:00
omar
9e1ad7295f
ImFont: Renamed (supposedly internal) fields (e.g. XAdvance to AdvanceX). Custom text renderers might be affected if they didn't use the GetCharAdvance() helper function.
2017-09-26 20:05:16 +02:00
omar
10bb9524eb
ImFont: Renamed ImFont::Glyph to ImFontGlyph (for consistency and so ImFontAtlas types can use it without ordering half of the file). Left a redirection type.
2017-09-26 19:54:30 +02:00
omar
f1a20ec66d
Merge branch 'master' into navigation
2017-09-26 16:54:37 +02:00
omar
be03882a15
Separator(): output vertical separator when used in horizontal layout mode, so it works in menu bars.
2017-09-26 15:43:48 +02:00
omar
c7a606ab7e
Horizontal layout does the minimum job to be usable internally - not exposed ( #97 )
2017-09-26 15:42:55 +02:00
omar
728deff56c
Comments, debug code (commented), todo list
2017-09-26 15:33:57 +02:00
omar
82748df71a
WantCaptureMouse: Tweaked logic so WantCaptureMouse can stay false when e.g. hovering over void while an InputText() is active. ( #621 )
2017-09-26 01:12:09 +02:00
omar
69d0d33451
Exposed PushMultiItemsWidths() to imgui_internal.h
2017-09-25 22:45:10 +02:00
omar
24f21bd4d4
Merge pull request #1113 from Urmeli0815/ImGuiSelectableFlags_MenuItem
...
MenuItem: only activate on Release, not on Click (nb: and not on ClickRelease to allow opening menu and selecting something with a single click. Windows seems to behave the same, allowing to click and hold to e.g. Open then move cursor, release on Save and save gets activated)
2017-09-25 22:13:38 +02:00
omar
7e8069dd23
Merge branch 'master' into navigation
2017-09-25 22:08:38 +02:00
omar
c0547d358d
Begin: Fixed auto-fit calculation code that predict the presence of ascrollbar so it works in the case size constraints are used. I actually don't need this fix now, but earlier experiment with BeginCombo() required this fix.
2017-09-25 22:04:39 +02:00
omar
4b2781fe87
Begin: Moving some code into a CalcSizeAutoFit() function.
2017-09-25 21:57:42 +02:00
omar
0d56140b4a
BeginCombo(): rework internals a little to make it easier to provide custom combo-like elements relying in BeginCombo().
...
BeginPopupEx() doesn't enforce AlwaysAutoResize flag anymore.
2017-09-25 21:45:34 +02:00
omar
4b82759598
SetNextWindowPos: added a ImVec2 pivot parameter for positioning a given a center, bottom-right position, etc. As a generalization of SetNextWindowPosCenter() which is now obsolete. This will be useful for combo-like popups as well.
...
Demo: Simple-overlay window uses the SetWindowPos pivot to select a corner to position itself at.
2017-09-25 18:25:43 +02:00
omar
0a55573288
Begin(): Minor tidying up of flow
2017-09-25 15:48:52 +02:00
omar
9f34925b2a
Window: Tweaked ApplySizeFullWithConstraint() -> CalcSizeFullWithConstraint() so it can be used without side-effect
2017-09-25 13:23:25 +02:00
omar
0a5fb24f10
Popups: Exposing a little more of popups internals in imgui_internals.h
2017-09-25 12:52:06 +02:00
omar
b9c185402e
Nav: minor tidying up NavUpdate() to use a local variables, easier to test replacing g.NavWindow with g NavMoveResultWindow for navigation accross flattened child windows.
2017-09-20 23:58:56 +02:00
omar
113b2467cd
Minor bits. Reduce usage of GImGui multiple times in same function.
2017-09-20 23:02:06 +02:00
omar
479e532f18
ColorEdit: fixed weird ternary pattern that makes some compiler warning (fair)
2017-09-18 21:41:49 +02:00
omar
f24b5f71ca
Merge branch 'master' into navigation
2017-09-18 15:35:47 +02:00
omar
79ce9b74d5
BeginTooltipEx() internal tweaks
2017-09-18 15:35:00 +02:00
omar
44e8d94aba
Merge branch 'master' into navigation
2017-09-18 15:32:31 +02:00
omar
105f3b14e4
Merge branch 'master' into styles
2017-09-18 15:11:51 +02:00
omar
9693fd5351
PushStyleVar/PopStyleVar: internal tweaks
2017-09-18 15:07:22 +02:00
omar
7c9e38f60a
Style: Moving code in a function to make incoming diff easier to parse.
2017-09-18 15:06:54 +02:00
omar
709653c330
Merge branch 'master' into styles
2017-09-18 15:03:25 +02:00
omar
6c91a1ef7f
Minor comments
2017-09-17 23:35:39 +02:00
omar
052999a6ab
More consistently uses "Dear ImGui"
2017-09-15 01:31:41 +02:00
omar
54d30d758f
Implicit "Debug" window uses a "Debug##Default" identifier to allow the user creating such window with custom flags
2017-09-12 13:16:27 +02:00
omar
62d7fa4324
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-09-06 20:33:39 +02:00
omar
f63c03c464
Internals: moved ButtonRepeat and AllowKeyboardFocus bools/stacks to a generic ItemFlags stack. Merged from Navigation branch.
2017-09-06 20:28:36 +02:00
omar
51fcef0c21
BeginCombo() tweaks, merged from Navigation branch.
2017-09-06 19:31:50 +02:00
omar
5c4fda0fbc
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-09-06 19:17:51 +02:00
omar
2169bf6895
Fixed WantTextInput from being true when an activated Drag or Slider was previously turned into an InputText(). ( #1317 )
2017-09-06 17:25:36 +02:00
omar
790605e359
Minor comments + renaming internal fields
2017-09-06 17:20:54 +02:00
Václav Patejdl
e1a7aa41cb
Improved ColorPicker hue wheel color interpolation
2017-09-05 16:31:54 +02:00
omar
2600b28f5d
Begin(): fixed calling Begin() more than once per frame setting window_just_activated_by_user which in turn would set Appearing to true for that frame.
2017-09-04 13:29:57 +02:00
omar
6400f2900a
Begin(): renamed locals.
2017-09-04 13:26:46 +02:00
omar
a9c6a0f6ec
Begin(): Removed unnecessary code (at the time of 1.18 commit e9e0e36f98, CursorPos was used to compute SizeContentsFit and this was necessary)
2017-09-04 13:24:45 +02:00
omar
89cae37b49
Begin(): Tidying up some code, should be a no-op.
2017-09-04 13:05:20 +02:00
omar
8fbe8709f9
TODO, minor tweak
2017-09-04 13:03:04 +02:00
omar
e8dbf1c795
Combo: Internally split into BeginCombo(), EndCombo(), toward a more flexible combo api.
2017-09-01 22:10:13 +02:00
omar
5658675e9d
Combo: Removed unnecessary ClearActiveId() call (from era where active combo stored an id, now we just use popup functionality)
2017-09-01 21:58:58 +02:00
omar
804ee78731
Added IsWindowAppearing().
2017-09-01 21:55:59 +02:00
Branimir Karadžić
670d40642f
Fixed C4267 conversion from size_t to int.
2017-09-01 14:42:49 +08:00
omar
6a1ba317c7
Demo: Minor coding style tweaks so bgfx copy needs less patching.
2017-08-29 19:05:56 +08:00
omar
97a40e74fb
Nav: Fixed bad merge of 6def01be5d so the bug fixed in #840 wasn't fully fixed in Nav branch.
2017-08-29 18:45:58 +08:00
omar
96d2942373
InputText: Merged bits from Navigation branch (inc. g.ActiveIdIsJustActivated is only set on the toggle).
2017-08-29 18:40:14 +08:00
omar
9a0171b803
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-08-29 18:29:44 +08:00
omar
35e4fa7b85
Merged from Navigation branch (DragBehavior)
2017-08-29 18:21:36 +08:00
omar
6cca4025ee
Merge from Navigation branch: 6aa8019763
2017-08-29 17:56:53 +08:00
omar
ddf41b0398
Merged from Navigation branch. TAB/Alt-TAB processing now deactivate if holding Ctrl.
2017-08-29 17:27:19 +08:00
omar
550dc09998
Merged from Navigation branch (misc)
2017-08-29 17:12:18 +08:00
omar
aef041f948
Merged from Navigation branch
2017-08-29 17:09:56 +08:00
omar
c9298c2657
Merged from Navigation branch:
...
f71cdd13b7c816e6c742#323 , #246 )
2017-08-29 17:09:44 +08:00
omar
287a4b6b38
Merged from Navigation branch: 5cac4926c8 fix title bar color of window under a modal window.
2017-08-29 16:52:37 +08:00
omar
a9e1d9aab9
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
2017-08-29 16:21:46 +08:00
omar
358e7a194e
Added GetKeyPressedAmount() (from Nav branch) to be able to measure fast repeat rate accurately. Added internal CalcTypematicPressedRepeatAmount() function.
2017-08-29 16:13:17 +08:00
omar
1f1e63f705
Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. Some code in NewFrame() has been moved around. ( #787 )
2017-08-29 16:06:52 +08:00
omar
ee42fae468
Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. ( #787 )
2017-08-29 16:05:12 +08:00
omar
6752cba4bc
Removed duplicate comments
2017-08-29 15:39:11 +08:00
omar
2ee1b70652
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
2017-08-29 15:36:36 +08:00
omar
f8eef49575
ProgressBar() fixed rendering when straddling rounded area. ( #1296 )
2017-08-29 15:23:07 +08:00
omar
7a9ea281be
ImSwap() helper.
2017-08-28 19:27:12 +08:00
omar
1f51e8f39d
Internals: Renamed some ImGuiCorner enums.
2017-08-28 14:11:11 +08:00
omar
7a7327adde
ParseFormatPrecision() returns -1 for scientific noation 'e'/'E', RoundScalar() doesn't alter those.
2017-08-28 13:19:36 +08:00
omar
807322c9a5
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-08-26 18:43:10 +08:00
omar
b295e185ff
Updated copyright date for 2017, updated Gallery link
2017-08-26 16:42:40 +08:00
omar
419b22a487
Internals: Split some code out of NewFrame() into an Initialize() function.
2017-08-26 16:35:39 +08:00
omar
5938f1ba61
Added IsMousePosValid() helper.
2017-08-26 15:18:06 +08:00
omar
a02210a455
Fixed compilation with IMGUI_DISABLE_OBSOLETE_FUNCTIONS defined
2017-08-26 00:31:44 +08:00
omar
92a6faca6f
IO: io.MousePos needs to be set to ImVec2(-FLT_MAX,-FLT_MAX) when mouse is unavailable/missing. Previously ImVec2(-1,-1) was enough but we'll now accept negative mouse coordinates.
2017-08-25 16:43:25 +08:00
omar
37f3a718c6
Marked all fmt + va_list functions with format attribute so GCC/Clang can warn about them. Not ignoring -Wsuggest-attribute=format anymore for GCC/Clang.
2017-08-25 16:10:14 +08:00
omar
40f608ce9b
Version 1.52 WIP
2017-08-25 15:12:12 +08:00
omar
55a6209931
Version 1.51
2017-08-25 00:29:59 +08:00
omar
e6ed2f9939
Nav: Tooltip do not appear in navigation focus list. ( #1294 , #787 )
2017-08-25 00:06:57 +08:00
omar
d213c0eb7e
Style: Tweaked default border (undo half-way from original c1e1e015c4) ( #707 )
2017-08-24 17:30:10 +08:00
omar
b0fc30bd19
Merge branch 'master' into navigation
2017-08-22 20:49:02 +08:00
omar
92efa00bc9
Minor miscellaneous merges from Navigation branch to reduce divergence a little bit
2017-08-22 20:44:39 +08:00
omar
6ed75d3046
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-08-22 20:27:39 +08:00
omar
eb2bbf6f29
Renamed IsItemHoveredRect() to IsItemRectHovered(). Renamed IsMouseHoveringWindow() to IsWindowRectHovered() - follow up to previous commit 6be7d4904e merged from Nav.
2017-08-22 20:25:27 +08:00
omar
52b39af0a0
Style: Added obsolete redirects for ImGuiCol_Columns*** fields. (ref 648f75b245)
2017-08-22 20:23:46 +08:00
omar
6be7d4904e
Merge part of 88c1966629 from Nav branch. Renamed IsMouseHoveringAnyWindow() -> IsAnyWindowHovered(), IsMouseHoveringWindow() -> IsWindowHoveredRect() for consistency. Kept inline rediection function.
2017-08-22 20:10:02 +08:00
omar
141339e4b7
(internals) Renamed FocusedWindow to NavWindow to match terminology of navigation branch
2017-08-22 19:51:12 +08:00
ocornut
2ad2190d47
Merge 20a0fde012 Tidying up default clipboard handler for non Windows-OS (from Nav branch)
2017-08-22 19:47:52 +08:00
omar
f3ab5e6252
Fixed InputText() bug with ImGuiInputTextFlags_EnterReturnsTrue (in nav branch only) ( #787 ). Thanks @Grouflon
2017-08-22 19:43:49 +08:00
omar
bea06117bb
Nav: Fix navigation inside child windows. Removed GetChildID() and storin/g the info within the window. ( #1291 )
2017-08-22 19:26:21 +08:00
ocornut
50b3a14d0a
Merge 2545d75c3b from Nav - Tidying up, removed two unnecessary window flags from being exposed in imgui.h
2017-08-22 18:26:27 +08:00
omar
d5b0d51274
Minor miscellaneous merges from Navigation branch to reduce divergence a little bit
2017-08-22 18:13:10 +08:00
omar
9670fe9ca7
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-08-22 17:51:20 +08:00
omar
6ee317d26d
ImRect::Clip() -> ClipWith() to clarify meaning, going to undo the change in Nav branch.
2017-08-22 17:46:50 +08:00
omar
6c82af2b96
Navigation branch fix (we changed Clip)
2017-08-22 17:44:49 +08:00
omar
543dc2817f
Fixed an assert when calling CloseCurrentPopup() twice in a row.
2017-08-21 22:54:20 +08:00
omar
53e73182ff
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
2017-08-21 00:04:45 +08:00
omar
530baee1a7
Removed tabs that slipped through the cracks
2017-08-21 00:03:37 +08:00
omar
067127f113
Columns: Caching columns clipping rectangles ( #125 )
2017-08-20 23:17:59 +08:00
omar
adeaf1cd72
Columns: Moved PushColumnClipRect() to imgui_internal.h
2017-08-20 23:09:43 +08:00
omar
54bdd00df7
Columns: Fix for explicit content width and scrollbar. ( #519 , #125 )
2017-08-20 21:32:18 +08:00
omar
83e8d10fab
Columns: Columns set resize based on the presence of vertical scrollbar. Not 100% sure about that but it looks like we've fixed enough bugs that this may not cause troubles anymore. ( #125 , #913 , #893 , #1138 )
2017-08-20 21:08:07 +08:00
omar
1ebd7ec049
Demo: Columns: Added Horizontal Scrolling demo. Tweaked another Columns demo. ( #519 , #125 , #913 )
2017-08-20 20:58:24 +08:00
omar
7ff1c149b5
Columns: Fixed another form of shearing made visible by the PreserveWidth option. The code was initially added in c46d5634d4 to fix because we've fixed in e42aaede42eb6d8a47cf104f3afd6057b13a61ee. ( #913 , #125 )
2017-08-20 20:58:24 +08:00
omar
1c83b073c6
Columns: A set of column (and most importantly the right-most column) do not register its content to the parent, not affecting the window contents size. ( #519 , #125 , #913 )
2017-08-20 20:58:23 +08:00
omar
7f0063f858
Columns: Added ImGuiColumnsFlags_NoResize flag (internal). ( #913 , #125 )
2017-08-20 19:32:50 +08:00
omar
e70d49ba1f
Columns: Fixed one form of shearing during resizing columns with PreserveWidth enabled (there's another issue still). ( #913 , #125 )
2017-08-20 19:32:50 +08:00
omar
9307631c90
Columns: Removed unnecessary/misleading dummy ItemSize(). Was fixed already before, and fixed again in this branch by 3bf2af23e6. ( #913 , #125 ). End() calls EndColumns() directly.
2017-08-20 19:32:50 +08:00
