Commit Graph

  • 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) omar 2017-09-29 18:24:43 +0200
  • 9737efb2f1 Nav: Store per-window last nav id also per-layer so we can easily query them for menu navigation code. (#787) omar 2017-09-29 17:58:25 +0200
  • 8a814487fe Merge branch 'master' into navigation omar 2017-09-29 16:30:43 +0200
  • fba9353c60 BeginMenu: Shuffling braces around to clarify flow omar 2017-09-29 16:29:00 +0200
  • cf308f4039 Nav: Fixed SetItemDefaultFocus from stealing default focus when we are initializing default focus for a menu bar layer (#787) omar 2017-09-29 00:20:51 +0200
  • 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) omar 2017-09-29 00:01:26 +0200
  • 30b1d85962 Nav: Commiting some better organized Debug helper because this going to stay for a bit. omar 2017-09-28 23:48:30 +0200
  • 3b85a8b6a0 Demo: Added an extra test related to baseline and fixed an id collision. omar 2017-09-28 20:15:32 +0200
  • 164f22d5b7 Comments omar 2017-09-28 19:35:10 +0200
  • 1f7f54e196 Removed extraneous test. omar 2017-09-28 22:00:17 +0200
  • c0cf123e0b Update README.md omar 2017-09-28 20:39:36 +0200
  • df366b230e ColorPicker4: Use nav flag to provide a slighly better experience when using navigation (#787, #346) omar 2017-09-28 20:22:30 +0200
  • 7c2926de17 Demo: Added an extra test related to baseline and fixed an id collision. omar 2017-09-28 20:15:32 +0200
  • 2d859dee4e Nav: Added ImGuiItemFlags_NoNav item flag omar 2017-09-28 19:58:01 +0200
  • 878fa96896 Nav: Re-arranged ItemAdd() to maximize early out (#787) omar 2017-09-28 19:57:24 +0200
  • dd0855de5c ButtonBehavior: Tidying up. omar 2017-09-28 19:47:45 +0200
  • 4b4e455c40 Nav: Internal nenaming omar 2017-09-28 19:41:30 +0200
  • 50ba543743 Comments omar 2017-09-28 19:35:10 +0200
  • e0a2a832cd Nav: Changed internal flag to NoNavDefaultFocus to be false by allow, and more consistent (#787) omar 2017-09-28 19:18:41 +0200
  • 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) omar 2017-09-28 19:07:52 +0200
  • ca4db8c905 Merge branch 'master' into navigation omar 2017-09-28 17:40:25 +0200
  • e8f7c83138 Begin: Shallow tweak to minimize diff with nav branch omar 2017-09-28 17:37:55 +0200
  • 926c1cf9a4 Merged from Navigation branch: ImGuiItemFlags_SelectableDontClosePopup flag omar 2017-09-28 17:02:28 +0200
  • f99348711b Added VerticalSeparator() entry point in imgui_internal. Seperator() in an horizontal layout context still does that. omar 2017-09-28 16:41:01 +0200
  • 9142002121 Separator(): Tweak Logging so that the separator text is aligned according to tree padding. omar 2017-09-28 16:40:28 +0200
  • d394c7ad0b Merge branch 'master' into navigation omar 2017-09-28 15:45:35 +0200
  • 0106dcbd02 Fixed IsItemHovered() - part of the processing has to be done in ItemAdd() because the widget may alter clipping rectangle temporarily. omar 2017-09-28 15:43:26 +0200
  • 2a8eb618dc Nav: Fixed NavDown to open menu from a menu bar (#787) omar 2017-09-28 00:36:58 +0200
  • 35f65e05ed Merge branch 'master' into navigation omar 2017-09-28 00:33:29 +0200
  • fafe65a8fc Refactor to move the responsability of SetHovered() to ItemHoverable() - previously IsHovered(). Simpler and the parallel to ItemAdd is clearer with the new name. omar 2017-09-28 00:21:47 +0200
  • 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) omar 2017-09-28 00:05:35 +0200
  • eca74d55c7 IsItemHovered(), IsHovered(): Shallow tweaks, eventually removed all the braces. omar 2017-09-28 00:05:18 +0200
  • 2b7d4c713e Internals: Moved IsWindowContentHoverable() in the file omar 2017-09-27 23:31:03 +0200
  • c5a79deb38 IsItemHovered(), IsHovered(): Shallow tweaks to make them more symetrical. Removed one set of braces. omar 2017-09-27 23:10:46 +0200
  • 7bcb1d3816 Internals: ButtonBehavior(), IsHovered() moved the responsability of flatten_child higher level to ButtonBehavior() - not super sure about the elegance of this omar 2017-09-27 22:59:40 +0200
  • 79ef64430c Nav: Fixed merge cc26db8ec7 omar 2017-09-27 17:27:21 +0200
  • cc26db8ec7 Merge branch 'master' into navigation omar 2017-09-27 17:25:50 +0200
  • 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. omar 2017-09-27 17:21:50 +0200
  • 19e22baa06 ItemAdd(): more re-ordering of tests to match IsHovered() + comments omar 2017-09-27 17:06:07 +0200
  • 344d48be31 IsItemHovered(), ItemAdd(): Fixed seemingly unnecessary comparaison of root windows, makes IsItemHovered() more consistent with internal IsHovered(). Original test was added in 6e99688fa7 should not have been using RootWindow in the first place. The difference between public-facing and internal versions would only be noticeable with overlapped child windows, which doesn't really happen anyway omar 2017-09-27 16:49:25 +0200
  • c075786d8b ItemAdd(): re-ordering the tests, submission should now be faster. omar 2017-09-27 16:29:46 +0200
  • 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(). omar 2017-09-27 16:20:53 +0200
  • e87ad328e4 Moved implementation of Hovered-related functions next to each others + comments, before I attempt to work on them. No functional change here. omar 2017-09-27 16:07:47 +0200
  • 842e88a8e3 Examples: Avoid using ImColor() to not tempt newcomers into looking at it omar 2017-09-27 15:47:08 +0200
  • 869732c456 Nav: Removed unnecessary combo code (that kept the combo arrow highlighted after reverting to mouse controls). (#787) omar 2017-09-27 12:34:18 +0200
  • a2b2e56e8e Merge branch 'master' into navigation omar 2017-09-27 12:31:12 +0200
  • e56eba44fe Fixed not being able to move a window by clicking on one of its child window (#1337, #635), broken by 313d388bba omar 2017-09-27 12:25:40 +0200
  • 8374a454da Removed extraneous ImGui:: prefixes. Declared ColorEditOptionsPopup in imgui_internals.h. Tweaked internal signatures. omar 2017-09-27 11:39:13 +0200
  • 09f6f564d9 ImFontAtlas: Fixed calling Clear() and rebuilding (broken in 3fe2ecfd4c) thanks @pdoane @mikesart omar 2017-09-27 11:21:42 +0200
  • 947e299c95 Merge d0597b15c1 into bbd6d5d5b5 Andrew Copland 2017-09-27 00:32:00 +0000
  • bbd6d5d5b5 Combo: Cleaned up, removed unnecessary code (looks like this part went untouched for a long time!). omar 2017-09-27 00:20:09 +0200
  • 8fd4beddb8 Merge branch 'master' into navigation omar 2017-09-26 20:28:40 +0200
  • 3fe2ecfd4c ImFontAtlas: Added support for CustomRect API to submit custom rectangles to be packed into the atlas / and map them as font glyphs omar 2017-09-26 20:24:27 +0200
  • 501e73feed Minor comments omar 2017-09-26 20:18:14 +0200
  • 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. omar 2017-09-26 20:05:16 +0200
  • 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. omar 2017-09-26 19:54:30 +0200
  • 072d6d8cb5 ImFontAtlas: Refactored internals API to 1) avoid building lookup table multiple times for merged fonts + 2) allow the mapping of custom icons inside fonts (wip, uncommited) omar 2017-09-26 19:26:16 +0200
  • 2170b0b278 ImFontAtlas: Comments and minor reorganization of declaration in header file. omar 2017-09-26 19:10:29 +0200
  • 529ca279a4 ImFont: Split some building code into a AddGlyph() helper (that custom rect code and imgui_freetype can use) omar 2017-09-26 18:41:21 +0200
  • f1a20ec66d Merge branch 'master' into navigation omar 2017-09-26 16:54:37 +0200
  • be03882a15 Separator(): output vertical separator when used in horizontal layout mode, so it works in menu bars. omar 2017-09-26 15:43:48 +0200
  • c7a606ab7e Horizontal layout does the minimum job to be usable internally - not exposed (#97) omar 2017-09-26 15:42:55 +0200
  • 728deff56c Comments, debug code (commented), todo list omar 2017-09-26 15:33:57 +0200
  • 99b9f1c93c Fix static misusage error with decent compilers. Error introduced in 4b82759598 omar 2017-09-26 11:23:06 +0200
  • 82748df71a WantCaptureMouse: Tweaked logic so WantCaptureMouse can stay false when e.g. hovering over void while an InputText() is active. (#621) omar 2017-09-26 01:12:09 +0200
  • 69d0d33451 Exposed PushMultiItemsWidths() to imgui_internal.h omar 2017-09-25 22:45:10 +0200
  • 9577ebf008 Merge branch 'master' into navigation omar 2017-09-25 22:14:37 +0200
  • 24f21bd4d4 Merge pull request #1113 from Urmeli0815/ImGuiSelectableFlags_MenuItem omar 2017-09-25 22:13:38 +0200
  • 7e8069dd23 Merge branch 'master' into navigation omar 2017-09-25 22:08:38 +0200
  • 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. omar 2017-09-25 22:04:39 +0200
  • 4b2781fe87 Begin: Moving some code into a CalcSizeAutoFit() function. omar 2017-09-25 21:57:42 +0200
  • 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. omar 2017-09-25 21:45:34 +0200
  • a34edb810e Demo: Fixed overlay demo keeps resizing (in case, e.g.: font changes) omar 2017-09-25 21:12:07 +0200
  • 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. omar 2017-09-25 18:25:43 +0200
  • 0a55573288 Begin(): Minor tidying up of flow omar 2017-09-25 15:48:52 +0200
  • 9f34925b2a Window: Tweaked ApplySizeFullWithConstraint() -> CalcSizeFullWithConstraint() so it can be used without side-effect omar 2017-09-25 13:23:25 +0200
  • 0a5fb24f10 Popups: Exposing a little more of popups internals in imgui_internals.h omar 2017-09-25 12:52:06 +0200
  • 3fd5790814 Pass render target format in ImGui_ImplDX12_Init() instead of hard-coded. Jefferson Montgomery 2017-09-24 14:57:38 -0700
  • f6b6dace9e Pass command list in using ImGui_ImplDX12_NewFrame() instead of ImGui_ImplDX12_Init() Jefferson Montgomery 2017-09-24 14:43:37 -0700
  • f72b95d73f Merge 'ocornut/master' into 'jdmo3/master' Jefferson Montgomery 2017-09-24 14:22:25 -0700
  • 3dd3d0b248 Examples: DirectX11: allow creating device with feature level 10 sinec we don't really need much for that example. (#1333) omar 2017-09-24 12:54:49 +0200
  • 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. omar 2017-09-20 23:58:56 +0200
  • 113b2467cd Minor bits. Reduce usage of GImGui multiple times in same function. omar 2017-09-20 23:02:06 +0200
  • 229921541b TODO list omar 2017-09-20 18:51:33 +0200
  • 9b2672a99f Update README.md omar 2017-09-19 18:33:04 +0200
  • 2fc07c1b7d Update README.md omar 2017-09-19 18:32:09 +0200
  • ba12d37719 Merge pull request #1324 from waywardmonkeys/improve-clang-warnings omar 2017-09-19 18:18:53 +0200
  • 479e532f18 ColorEdit: fixed weird ternary pattern that makes some compiler warning (fair) omar 2017-09-18 21:41:49 +0200
  • 92e55a8a79 Merge branch 'master' into navigation omar 2017-09-18 16:06:48 +0200
  • d5d825debb Nav/Examples: honoring the io.WantMoveMouse flag in most common examples (#323) ocornut 2016-07-30 23:17:11 +0200
  • 1ff27d7db8 Added io.WantMoveMouse flags from Nav branch so Examples/Binding can already implement it. (#787) omar 2017-09-18 16:04:28 +0200
  • f24b5f71ca Merge branch 'master' into navigation omar 2017-09-18 15:35:47 +0200
  • 79ce9b74d5 BeginTooltipEx() internal tweaks omar 2017-09-18 15:35:00 +0200
  • 44e8d94aba Merge branch 'master' into navigation omar 2017-09-18 15:32:31 +0200
  • 105f3b14e4 Merge branch 'master' into styles omar 2017-09-18 15:11:51 +0200
  • 564c97b87e Comments omar 2017-08-15 11:41:36 +0800
  • f0f86213db ImVector: added resize() variant with initialization value omar 2017-08-15 11:41:00 +0800
  • b409d399c8 Demo: style editor output tweak so it is easier to modify the output code.. + TODO list update omar 2017-08-15 17:48:41 +0800
  • 9693fd5351 PushStyleVar/PopStyleVar: internal tweaks omar 2017-08-15 19:19:00 +0800
  • 7c9e38f60a Style: Moving code in a function to make incoming diff easier to parse. omar 2017-08-14 15:14:46 +0800