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
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
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
9f200d10d5
Version 1.52
2017-10-27 17:10:41 +02:00
omar
267ea506de
Begin: Fix for unused "Debug" (fix for 3b83cd24f5 )
2017-10-27 16:45:56 +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
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
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
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
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
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
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
f7259e60ee
Comments
2017-10-20 21:17:51 +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
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
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
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
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
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
ce7b04e8b9
Removed apparently unncessary code in InputFloatN() and InputInt().
2017-10-13 23:59:17 +02:00
omar
4be967823f
Exposed Scrollbar() in imgui_internal.h and removed a bool arg
2017-10-13 13:30:28 +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
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
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
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
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
matiTechno
b36a043bbf
typo
2017-10-04 11:09:21 +02: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
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
fba9353c60
BeginMenu: Shuffling braces around to clarify flow
2017-09-29 16:29:00 +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
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
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
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
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
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
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
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
479e532f18
ColorEdit: fixed weird ternary pattern that makes some compiler warning (fair)
2017-09-18 21:41:49 +02:00
omar
79ce9b74d5
BeginTooltipEx() internal tweaks
2017-09-18 15:35:00 +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
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
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
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
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
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
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
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
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
d213c0eb7e
Style: Tweaked default border (undo half-way from original c1e1e015c4) ( #707 )
2017-08-24 17:30:10 +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
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
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
6ee317d26d
ImRect::Clip() -> ClipWith() to clarify meaning, going to undo the change in Nav branch.
2017-08-22 17:46:50 +08:00
omar
543dc2817f
Fixed an assert when calling CloseCurrentPopup() twice in a row.
2017-08-21 22:54:20 +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
omar
a511b00226
Columns: Fixed offset rounding leading to SetColumnOffset() being destructive when ImGuiColumnsFlags_NoPreserveWidths flag is not set. ( #913 , #125 )
2017-08-20 19:32:50 +08:00
omar
3bf2af23e6
Columns: Fixed EndColumns() not repositioning the cursor. ( #913 )
2017-08-20 18:44:54 +08:00
omar
19a42cb2fd
Columns: Moved BeginColumns/EndColumns/flags from #913 to imgui_internals.h + minor shallow tweaks. Removed demo code temporarily. ( #125 )
2017-08-20 18:44:48 +08:00
omar
bc78535bbf
Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-08-20 18:22:34 +08:00
omar
b4eeb4aa8d
Renamed GetStyleColName() to GetStyleColorName() for consistency. Extra comments in Api Breaking Changes section.
2017-08-20 17:53:09 +08:00
omar
af2db53780
Added GetStyleColorVec4()
2017-08-20 17:50:25 +08:00
omar
cf84650ee8
GCC warnings fixes
2017-08-20 16:39:43 +08:00
omar
fd394e1e95
Scrollbar: Comments. Fixed potential div-by-zero error which I can repro now, so added an assert to notify us if it's actually ever useful or not.
2017-08-20 16:39:11 +08:00
omar
91d841dd5f
Added PushStyleColor(ImGuiCol idx, ImU32 col) overload. (Which _might_ cause an "ambiguous call" compilation error if you are using ImColor() with implicit cast. Cast to ImU32 or ImVec4 explicily to fix.)
2017-08-20 15:28:12 +08:00
omar
24a78767d2
Merge branch 'master' into styles
...
# Conflicts:
# TODO.txt
2017-08-17 17:24:33 +08:00
omar
68bf5ecbc1
Marked the weird IMGUI_ONCE_UPON_A_FRAME helper macro as obsolete. prefer using the more explicit ImGuiOnceUponAFrame. Removed the broken __LINE__ from IMGUI_ONCE_UPON_A_FRAME
2017-08-16 17:51:44 +08:00
omar
a85a14370b
OpenPopupEx() internal tweaks to receive an ImGuiID, BeginPopupContextXXX shortening unnecessarily long identifier.
2017-08-16 15:47:10 +08:00
omar
a9915681eb
PushID()/PopID() to not need to mark parent window as Accessed (needlessly waking up the root "Debug" window) ( #747 )
2017-08-16 14:37:54 +08:00
omar
5ea1865fdb
(api breaking) changed parameter order for BeginPopupContextWindow(), note that most uses relied on default parameters completely.
2017-08-16 14:24:41 +08:00
omar
d2259f65e5
Undo part of 32dbe836d0 to keep the same name for both overloads ( #891 , #799 )
2017-08-16 13:42:41 +08:00
omar
f98376d02b
Merge branch 'is-popup-open' of https://github.com/mkeeter/imgui into mkeeter-is-popup-open
...
# Conflicts:
# imgui.cpp
2017-08-16 13:19:15 +08:00
omar
a83f7083ed
BeginPopupEx() uses ImGuiID internally
2017-08-16 13:06:14 +08:00
omar
1e162dfc74
PushStyleVar/PopStyleVar: internal tweaks
2017-08-15 19:19:00 +08:00
omar
18f217e631
Style: Moved position of ImGuiCol_TitleBgCollapsed
2017-08-15 19:06:02 +08:00
omar
5429bd892e
ColorEdit4: Added "Copy as..." option in context menu ( #346 )
2017-08-15 18:30:52 +08:00
omar
0f935248e3
Combo, Inputint, InputFloat, ColorEdit4 all use the small size for little square
2017-08-15 17:46:11 +08:00
omar
032c222d57
Merge branch 'master' into styles
2017-08-15 10:52:38 +08:00
omar
a6d69f04c0
PlotHistogram: bars are drawn based on the position of zero ( #828 )
2017-08-14 17:20:05 +08:00
omar
3d6e037c23
Comments ( #1034 )
2017-08-14 16:51:14 +08:00
omar
bd3dfc0eba
Moved TODO list to TODO.txt
2017-08-14 16:51:14 +08:00
omar
c26b29b254
Style: Moving code in a function to make incoming diff easier to parse.
2017-08-14 15:14:46 +08:00
omar
2b7fe73a08
Window size can be loaded from .ini data even if ImGuiWindowFlags_NoResize flag is set ( #1048 , #1056 )
2017-08-14 13:27:19 +08:00
omar
c1e1e015c4
Style: Tweaked default border (which is off by default) to be less noticeable ( #707 , #1019 )
2017-08-14 13:07:55 +08:00
omar
648f75b245
Style: renamed ImGuiCol_Columns_*** to ImGuiCol_Separator_*** (BREAKING), Separator() uses this color as well. ( #707 , #1019 )
2017-08-14 13:04:32 +08:00
omar
6a4064e5f2
PathArcToFast: Minor renaming for clarification. Comments.
2017-08-14 12:25:35 +08:00
omar
8c61a4eb4c
Fonts: Adding references to the fact that .OTF fonts are supported (but haven't renamed the entry points)
2017-08-14 11:29:54 +08:00
LuK1337
8352d43a0c
Fix broken ImGuiColorEditFlags_NoAlpha flag check
...
* Fixes warning:
imgui.cpp:9295:98: warning: enum constant in boolean context [-Wint-in-bool-context]
2017-08-11 22:52:40 +02:00
omar
908b025c3c
Fixed (unlikely) Ini saving crash if the ImGuiWindowFlags_NoSavedSettings gets removed from a window after its creation ( #1000 ) + minor FAQ tweaks
2017-08-12 01:23:39 +08:00
omar
08265bfbd9
RenderArrow(): fix warning. re-orderer lines to match enum order.
2017-08-11 14:44:53 +08:00
omar
d7cad903aa
Documentation tweaks
2017-08-11 14:29:27 +08:00
omar
7e452ec737
Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
2017-08-11 13:36:28 +08:00
omar
53d1b1e929
ColorPicker: Fixes for when ImGuiColorEditFlags_NoOptions flag is set: always read a default picker type + forward flag to sub ColorEdit widgets. ( #346 )
2017-08-10 10:25:50 +08:00
omar
fed18d3203
Removed old ValueColor() helpers. ( #346 )
2017-08-09 23:04:26 +08:00
omar
fc5ab0cb8d
RenderCheckMark() tidying up
2017-08-09 22:56:01 +08:00
omar
4fd148f4f9
Added ImFontAtlas::GlyphRangesBuilder helper + doc
2017-08-09 22:42:03 +08:00
omar
43e2abbee3
Comments, FAQ entry ( #586 , #1105 )
2017-08-09 20:27:59 +08:00
omar
55b99d753c
Minor string typo
2017-08-08 23:12:23 +08:00
omar
a78ef7a369
Comments
2017-08-08 16:07:17 +08:00
omar
942cb0e1f2
Added SetColorEditOptions(). ColorPicker4: context menu to select picker type and alpha bar. Reorganized flags (again!). ( #346 )
2017-08-08 15:54:20 +08:00
omar
a4012fd5b2
Merge branch 'master' into 2016-02-colorpicker
2017-08-08 11:30:10 +08:00
omar
b5ad88627d
Merge various documentation tweaks, comments, todos from the Navigation Branch to reduce drift a little
2017-08-08 11:27:48 +08:00
omar
a1bcc8392e
Fixed GetScrollMaxX() debug left-over from 7096fd8500 ( #1271 )
2017-08-08 11:15:34 +08:00
omar
1c991b525a
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
2017-08-07 22:34:30 +08:00
omar
0ab722c3c5
Columns: First first column appearing wider than others ( #1266 )
2017-08-07 22:28:09 +08:00
omar
d43c25d8f4
SetScrollHere() tweak to make the code a little less confusing
2017-08-07 21:54:41 +08:00
omar
e36b41cbd0
Fixed Y scroll aiming when Horizontal Scrollbar is enabled ( #665 ). Tweak log demo.
2017-08-07 21:53:57 +08:00
omar
7096fd8500
Fixes for Vertical Scrollbar not automatically getting enabled if enabled Horizontal Scrollbar straddle the vertical limit. ( #1271 , #246 )
2017-08-07 19:41:22 +08:00
omar
233a6efeba
Fixed GetScrollMaxX(), GetScrollMaxY(). Tweak demo to display more data. Using functions in Begin(). ( #1271 )
2017-08-07 18:35:15 +08:00
omar
46c73cccff
Popups window can be moved (if they don't have explicit positions provided by user, or e.g. sub-menu popup) ( #1252 )
2017-08-05 19:47:52 +08:00
omar
d762f1dbfb
Comments, clarification about io.WantCaptureMouse, io.WantCaptureKeyboard flags timing and NewFrame(). ( #1262 )
2017-08-05 19:15:03 +08:00
omar
95f2706d1c
Clipboard: [windows] Fixed not closing win32 clipboard on early return. ( #1264 )
2017-08-05 16:05:48 +08:00
omar
40ac84d701
DataTypeApplyOpFromText: renamed local variables + comments to avoid confusion about the fact that int and float paths are not totally symetrical. ( #671 )
2017-08-03 16:41:29 +08:00
omar
f6460970c5
ColorPicker: Hue wheel + SV triangle picker mode (mode selection flags still wip, missing context menu and persistent options). ( #346 )
2017-07-31 21:20:42 +08:00
omar
fb54dce71c
Internals: Added ImLineClosestPoint, ImTriangleClosestPoint helpers. Changing ImVec2 arg to const ImVec2&
2017-07-31 21:11:41 +08:00
omar
72da4081f8
Internals: Added ImTriangleBarycentricCoords() helper. Renamed ImIsPointInTriangle() to ImTriangleContainsPoint(), with different arg order.
2017-07-31 17:54:40 +08:00
omar
2f508c7073
ColorEdit: Extract ColorOptionsPopup() function out of ColorEdit4(). ( #346 )
2017-07-31 17:32:07 +08:00
omar
10ef5a63f0
ColorPicker: Rearrange code to introduce alternate HSV picker/selector with simpler diff. ( #346 )
2017-07-31 16:50:28 +08:00
omar
cc3cce7567
Comments, minor tidying up.
2017-07-31 16:48:45 +08:00
omar
70ee41b8b3
ColorPicker: Reordered drawing code to match left-to-right display. Extra comments. ( #346 )
2017-07-31 12:08:20 +08:00
omar
4b2f157fb1
Renamed ImGuiColorEditFlags_ModeMask_ to ImGuiColorEditFlags_InputsModeMask_ ( #346 )
2017-07-31 11:50:14 +08:00
omar
efbb1ae04e
ColorPicker4: Fixed forwarding _HDR flag from ColorPicker4 back to ColorEdit4 components. ( #346 )
2017-07-30 23:22:48 +08:00
