Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-23 04:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,453 Commits 13 Branches 79 Tags 86 MiB
20e89201cb
Commit Graph

2920 Commits

Author SHA1 Message Date
omar
84fbc49403 BeginChild: named child don't include the full id inside their name (#1698) 2018-04-03 22:13:35 +02:00
omar
78610a54d2 Fixed Clang zealous cast-call warning (on par with GCC) which decided to warn against explicit C-style casts now. 2018-04-03 20:55:30 +02:00
omar
77e234d9df Comments 2018-04-03 20:22:44 +02:00
omar
c461401b21 Comments, FAQ 2018-04-03 20:05:59 +02:00
omar
cc96477b1c Comments (#1695) 2018-03-25 14:45:40 +02:00
omar
b69dc45f6e Internals: Removed ImGuiDataType_Float2. 2018-03-22 20:14:31 +01:00
omar
c19b27813d Added InputDouble() function. We use a format string instead of a decimal_precision parameter to also for "%e" and variants. (#1011) May transition the other InputXXX function to use format strings as well. 2018-03-22 18:58:40 +01:00
omar
c796960ff9 InputFloat: Scientific input. InputText: Added ImGuiInputTextFlags_CharsScientific to add 'e' 'E' to list of characters that can be input. (later useful for #1011) 2018-03-22 17:49:53 +01:00
omar
21ac470a8a Nav: Fixed a crash with IMGUI_DEBUG_NAV_SCORING enabled + added info to Metrics. 2018-03-22 16:37:21 +01:00
omar
75c3793db5 IO: Added ImGuiConfigFlags_NoSetMouseCursors. Added ImGuiBackendFlags_HasMouseCursors, ImGuiBackendFlags_HasSetMousePos. (#787, #1495, #1202) 2018-03-20 21:19:23 +01:00
omar
dcf7c3d188 Added ImGuiBackendFlags for backend to expose its capabilities. Added ImGuiBackendFlags_HasGamepad. (#787, #1542) 2018-03-20 20:39:44 +01:00
omar
170f44e6f0 IO: Renamed io.WantMoveMouse to io.WantSetMousePos (was added in 1.52, _not_ used by core and only honored by some binding ahead of merging the Nav branch) + internal renaming (#787) 2018-03-20 20:12:34 +01:00
omar
d1c45db9e8 Fixed enum typo. 2018-03-19 22:47:10 +01:00
omar
62e94717eb Nav: InputText: Allow editing text input fields with NavActivate (space). Not sure about that, on one hand it feels more consistent but you can't finish the editing with space to double space (activate + input space) could feel inconsistent. (#787) 2018-03-19 13:20:25 +01:00
omar
33ad8b2f0c Nav: Track nav input source more generally (gamepad vs keyboard) (#787) + update todos and demo tweaks 2018-03-19 13:20:18 +01:00
omar
e7670c0bcc Style: CloseButton() now display a proper cross. Using Button colors for background. Removed ImGuiCol_CloseButton, ImGuiCol_CloseButtonActive, ImGuiCol_CloseButtonHovered as the closing cross uses regular button colors now. (#707) 2018-03-12 11:48:04 +01:00
omar
b9ac127b0b Internals: Columns renaming fields 2018-03-12 11:03:27 +01:00
omar
351b3fa7b0 Updated Changelog following merge of #1619 + fixed entry added to wrong version Changelog in 1ef1acbd8d 2018-03-09 10:29:41 +01:00
omar
a3d5f92214 Merge branch 'master' into font_offset 2018-03-08 16:49:39 +01:00
omar
642c6748ac Comments, Changelog 2018-03-08 11:15:27 +01:00
omar
cea7492bab Render: Removed the code that disable render if style.Alpha is 0.0f, it is both incorrect (as style Alpha can be modified mid-frame), not really necessary (just tested that full Alpha = 0 will lead to empty draw lists!) and misleading (bulk of the work was already done). 2018-03-05 22:47:53 +01:00
omar
51afaf7117 Fixed type cast warning. 2018-03-05 13:15:15 +01:00
omar
0ec356eb6e Comments, FAQ update. 2018-03-05 13:05:47 +01:00
omar
5ed45d0aec Columns: Fixed destructive small resize. (#1656). The OffsetNorm clamp introduced by #913 was ok as it didn't write back into the storage, which #1499 started doing making it destructive. Right now I don't think the clamp is needed at all. It had uses (eg: hide the issue fixed by bf7481eba0). 2018-03-04 17:55:59 +01:00
omar
bf7481eba0 Columns: Extent stop at the right-most clipped pixel. The right-most column might appear a little wider but it's usable space matches the others. (#125). +9 Internal: Store InnerClipRect. 2018-03-04 17:44:17 +01:00
omar
968a8d2a3f Columns: Clamping MaxX above MinX. This shouldn't have much of a benefit / affect, but the internal values are more sane this way. (#125) 2018-03-04 16:58:24 +01:00
omar
ee770af72c Columns: Adding per-window display in Metrics. Tidying up, removing old code/comments. (#125, #1499, #1656) 2018-03-04 16:56:21 +01:00
omar
69e700f869 Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added 2018-03-03 20:15:10 +01:00
omar
8a4093f38b Added ArrowButton(). Exposed ImGuiDir. 2018-03-03 20:08:03 +01:00
omar
1549c5cf5e BeginCombo(): Added ImGuiComboFlags_NoArrowButton and ImGuiComboFlags_NoPreview flags + hover color matches drag and sliders. 2018-03-03 19:43:31 +01:00
omar
ad7ff7504e Merge branch 'patch-1' of https://github.com/stfx/imgui into stfx-patch-1 2018-03-03 19:34:47 +01:00
omar
839cdd37a3 Combo: Arrow button isn't displayed over frame color, so color is consistent with other button + the button doesn't have inner rounding. 2018-03-03 19:23:48 +01:00
omar
11f13ab24f Internal: renamed RenderTriangle() to RenderArrow(). 2018-03-03 19:08:22 +01:00
omar
6797ee4b68 Nav: Added links to PNG/PSD files for PS4 and Switch. Fixed suggested Joy-con mapping as per typical Nintendo-style mapping. (#787) 2018-03-01 13:03:12 +01:00
omar
c994796e26 Internal: Moved IM_NEWLINE helper to imgui_internal.h 2018-02-28 21:45:02 +01:00
omar
2c9f45bbe7 Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787) 2018-02-28 18:51:40 +01:00
omar
c7835dd189 ImRect: Removed misleading IsFinite() function used by some Nav code. 2018-02-26 16:35:46 +01:00
omar
5427eca960 Compacted some old Breaking Changes notes (Pre July 2015 stuff) 2018-02-25 19:05:31 +01:00
omar
bd267ad739 Changelog: Added all change infos since 1.53 up to the current version. 2018-02-25 14:15:38 +01:00
omar
27667fc035 TreeNode: Renamed Beta ImGuiTreeNodeFlags_NavCloseFromChild to ImGuiTreeNodeFlags_NavLeftJumpsBackHere. (#1079) 2018-02-25 14:15:37 +01:00
omar
8040cf1425 Merge branch 'master' of https://github.com/podgorskiy/imgui into podgorskiy-master 2018-02-22 23:22:16 +01:00
Podgorskiy
94466745bb A tiny optimization to ImLineClosestPoint. Removed unnecessary sqrtf call. 
ab_lenSqr -> ab_len_sqr
Moved line where ab_len_sqr is computed after the first return
 2018-02-22 10:57:20 -05:00
omar
b28995b667 Nav: Internals: Exposed NavMoveRequestCancel in imgui_internal.h (#1640) 2018-02-22 15:39:49 +01:00
omar
2c3c5125b3 Drag and Drop: BeginDragDropSource(): temporarily removed the optional mouse_button=0 parameter because it is really usable in typical conditions at the moment. (#143, #1637) 2018-02-21 21:33:58 +01:00
omar
7cbcccd96b Update Breaking Change section with moved misc/fonts/ (#1631) 2018-02-20 12:08:37 +01:00
omar
7ee2bc8f5e FAQ about backslashes in string literal since the one in main.cpp isn't being noticed enough. (#1397) 2018-02-20 10:24:31 +01:00
omar
b33f0e215f Initialization happens during CreateContext(), which makes it easier for platform layers to interact with the context during their initialization. 2018-02-18 23:28:56 +01:00
omar
1399c9c8a9 Merged a bunch of small inconsequential things from my work branch, to reduce the diff noise. 2018-02-18 20:21:21 +01:00
omar
bdb27366e7 Nav: Tweak windowing highlighting for full viewport windows. 2018-02-17 00:19:04 +01:00
omar
63332d152a Obsoleted the io.RenderDrawListsFn callback, you can call your graphics engine render function after ImGui::Render(). Use ImGui::GetDrawData() to retrieve the ImDrawData* to display..(#1599) 
Examples: Updated examples.
 2018-02-16 19:18:16 +01:00
omar
20c14f9589 Fixed GCC zealous warnings (#1623) 2018-02-16 15:43:28 +01:00
omar
1cbfe0700c Plot: plot a flat line if scale_min==scale_max (#1621) 2018-02-16 14:34:49 +01:00
omar
30c469f7c5 ImFont: DisplayOffset.y defaults to 0 instead of +1. 2018-02-15 10:46:28 +01:00
omar
eb1d481915 Comments (#1230, #1611) 2018-02-12 15:38:04 +01:00
omar
d8d1da27fd Merge branch 'master' of https://github.com/RandyGaul/imgui into RandyGaul-master 2018-02-12 15:35:16 +01:00
Randy Gaul
2c4a761982 __cdecl markup for non-standard calling conventions via MSVC 2018-02-12 00:50:40 -08:00
omar
64e0666803 Internals: Moved some of NewFrame() into UpdateMovingWindow(). 2018-02-11 22:48:30 +01:00
omar
7cc1bc7635 Added IsAnyMouseDown() helper. 
Examples: DirectX9/10/11: Using IsAnyMouseDown() instead of local function.
 2018-02-10 16:50:19 +01:00
omar
3b163ac35b Internals: Clarified internal storage for RootWindow with specific semantic (the Docking branch will need to introduce finer differenciation there.) 2018-02-08 23:11:51 +01:00
omar
d17d21da1b Warning fix. (#1565) 2018-02-06 20:21:29 +01:00
omar
7c16d52f72 Updated version to 1.60 WIP to emphasis on the addition of required calls CreateContext/DestroyContext + merged the massive Navigation branch (#1565, #787) 2018-02-06 20:20:34 +01:00
omar
f0364aa359 Merge branch 'context' 
# Conflicts:
#	examples/allegro5_example/main.cpp
#	examples/directx10_example/main.cpp
#	examples/directx11_example/main.cpp
#	examples/directx9_example/main.cpp
#	examples/marmalade_example/main.cpp
#	examples/opengl2_example/main.cpp
#	examples/opengl3_example/main.cpp
#	examples/sdl_opengl2_example/main.cpp
#	examples/sdl_opengl3_example/main.cpp
#	examples/vulkan_example/main.cpp
 2018-02-06 20:16:03 +01:00
omar
4e5b7612ae Nav: Documentation tweaks. (#787) 2018-02-06 20:10:05 +01:00
omar
3171f90a1a Nav: Keyboard is now automatically mapped based on io.KeyDown[]. (#787) 2018-02-06 19:54:30 +01:00
omar
7e32fc7109 Nav: Toward automatically mapping keyboard input. Renamed ImGuiNavInput_PadXXX to ImGuiNavInput_XXX. Renamed ImGuiNavInput_KeyXXX to ImGuiNavInput_KeyXXX_ (internal). (#787) 2018-02-06 19:23:12 +01:00
omar
ed4bbc4fd4 Nav: Comments, guides. 2018-02-06 18:48:31 +01:00
omar
cea8017e0b Merge branch 'master' into context 2018-02-06 18:04:44 +01:00
omar
db071184a0 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 2018-02-06 13:51:09 +01:00
omar
b50dce54ea Drag and Drop: TreeNode as drop target displays rectangle over full frame. Added optional internal storage for item display rect. Will expose later. (#1597, #143) 2018-02-06 13:46:14 +01:00
omar
c6ba7c8231 Internals: TreeNode: Renaming local to be more consistent with other widgets. 2018-02-06 13:41:46 +01:00
omar
e6926d9f7c Internals: Refactored bool LastItemRectHovered into flags. (#1597) 2018-02-06 13:34:41 +01:00
omar
ce2b8d3255 Nav: Comments, removed extraneous parameter. 2018-02-06 13:16:44 +01:00
omar
0c0d811859 Nav: SetItemDefaultFocus() doesn't make the navigation cursorr highlight visible. Renamed NavInitResultExplicit to NavInitRequestFromMove. (#787) 2018-02-05 23:53:40 +01:00
omar
fb9fecea5e Nav: Sliders and Drags are toggle activated instead of requiring user to cross Cross/Space. (#787) 2018-02-05 20:16:38 +01:00
omar
4932303e62 Nav: DragBehavior: Tweaks (to take the noise out of the next commit). 2018-02-05 20:15:31 +01:00
omar
e5e3cc617e Nav: Maintaining a NavActivatePressedId field that widget can conveniently use along with NavActivateDownId. 2018-02-05 19:37:29 +01:00
omar
fb7cf4a475 Nav: Removed old unnecessary ifdefs. 2018-02-05 18:25:03 +01:00
omar
f35734c925 Nav: Debugging code. (#787) 2018-02-05 17:02:30 +01:00
omar
92ee6b1185 Nav: Sets io.WantCaptureKeyboard when navigation is active. This is a little agressive but probably the best default and also a good way to get feedback. Added ImGuiNavFlags_NoCaptureKeyboard to disable this behavior. Comments. (#787) 2018-02-05 16:07:54 +01:00
omar
348c46d21e Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 2018-02-05 15:50:28 +01:00
omar
11d0fc8220 Tooltip: BeginTooltip() sets NoInputs flag. 2018-02-05 15:10:07 +01:00
omar
1dedbf8091 Style: Fixed missing style.MouseCursorScale initialization (#939), messed up original commit badly. 2018-02-05 15:07:25 +01:00
omar
533fe8cb55 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 2018-02-05 14:55:57 +01:00
omar
8ad88f725c Nav: Minor tidying up. (#787) 2018-02-05 14:53:22 +01:00
omar
3f297e74e4 Merging the minor/shallow changes from Navigation branch. 2018-02-05 14:52:28 +01:00
omar
2081fc15b5 Added assert in BeginChild(ImGuiId id). 2018-02-05 13:42:34 +01:00
omar
223be68d77 Nav: Debugging stuff. 2018-02-05 13:42:33 +01:00
omar
66ff820eaa Nav: Ensure g.NavScoringRectScreen is always finite and not inverted. (#787) 2018-02-04 18:30:46 +01:00
omar
0bd15b52a6 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 2018-02-04 13:16:13 +01:00
omar
147ec8d1e2 Style Added style.MouseCursorScale, may remove (#939). 2018-02-04 12:17:35 +01:00
omar
648de2fc00 Nav: Press Left on a child with ImGuiTreeNodeFlags_NavCloseFromChild moves you to parent node instead of closing it immediately. More standard. (#787, #1079) 2018-02-02 18:38:18 +01:00
omar
ce9d7baaba Nav: TreeNode: Added ImGuiTreeNodeFlags_NavCloseFromChild flag, allow closing a TreeNode() from any of child. The explicit flag is not great, perhaps allowing some form of inheritance would help. (#787, #1079) 2018-02-02 17:47:05 +01:00
omar
9120938200 Nav: Revert 5c9ea4d53a with comments. (#787) 2018-02-01 23:53:00 +01:00
omar
96ddfbc973 Nav: Modal windows can't be closed with Nav PadCancel. (#787) 2018-02-01 23:36:22 +01:00
omar
efbd8cebe7 Nav: Comments (#787) 2018-02-01 22:53:08 +01:00
omar
c4fc879508 CloseButton: Fixed cross positioning. 2018-02-01 22:33:48 +01:00
omar
942c140710 CloseButton: Fixed cross positioning. 2018-02-01 22:32:52 +01:00
omar
68d3e139a7 Nav: When focusing a parent window while closing a popup, hide its highlight for one frame to avoid potential double highlight and flicker with the common pattern of menu items leading to the opening other windows. (#787) 2018-02-01 22:28:58 +01:00
omar
950f260a32 Nav: Fixed Selectable/MenuItem Nav Highlight from using rounding when outer highlight stays square. (#787) 2018-02-01 22:25:25 +01:00
omar
c7b7b181b5 Nav: CloseButton reacts when clipped. (#787) 2018-02-01 22:13:25 +01:00
omar
5c9ea4d53a Nav: Fixed press Left on sub-menu when parent wasn't a menu - we were just checking at the wrong level. (#787) 2018-02-01 21:33:23 +01:00
omar
eb737e0a42 Nav: Child window is restored on focus follow up. Fix bdd868704f. (#787, ~#727) One visible issue was pressing Left to leave a child menu. 2018-02-01 21:27:46 +01:00
omar
95f9c74b9a Metrics: Displaying some of the important internal window flags. 2018-02-01 21:27:45 +01:00
omar
79ff3c2d49 Merge branch 'master' into navigation 2018-02-01 18:33:40 +01:00
omar
07163804df Internals: Renamed CloseInactivePopups() to a better ClosePopupsOverWindow(). Exposed in imgui_internal.h 2018-02-01 18:31:41 +01:00
omar
5812d0b751 Nav: Using CTRL+TAB / PadFocusNext/Prev to Focus a window closes the previous window popups. (#787) 2018-02-01 18:29:30 +01:00
omar
fd6d8863f7 Nav: SetFocusID() clears NavInitRequest for consistency (repro would a same frame interaction / race condition). (#787) 2018-02-01 18:19:36 +01:00
omar
ef2c3bcdee Nav: Fixed InitRequest leaking when changing window (repro was to navigate inside File->Options->[Child] then press Left and notice how we would land on parent window on the fist item after the current one). (#787) 2018-02-01 18:02:55 +01:00
omar
8cc2dbc3bd Internals: Nav: Extracted code into IsWindowNavFocusable(). (#787) 2018-02-01 14:56:56 +01:00
omar
bdd868704f Nav: Child window is restored on focus when returning to layer 0 or refocusing. This is a little experimental and potentially error-prone right now. (#787, vaguely relate to ~#727) Ideally we should maintain a non-sorted last-focused list that include childs windows. 2018-02-01 00:50:42 +01:00
omar
7b22a91578 Nav / Slider: Fixed reaching edge of integer slider with navigation input, bug introduced on January 25 in Nav branch 10a4a77b27. (#787) 2018-02-01 00:08:13 +01:00
omar
eaa6f490a2 Merge branch 'master' into navigation 
# Conflicts:
#	imgui_demo.cpp
 2018-01-31 23:38:05 +01:00
omar
9bc5c089b6 Internal: Avoid needlessly bringing parent of front-most child back to front. This is mostly to reduce flicker/confusion in Metrics when traversing windows. We could aim at separating the child windows from non-child windows at some point. 2018-01-31 23:37:05 +01:00
omar
76d8af4036 Nav: when browsing a window that has no activable items (scroll only) we keep a highlight on the child. (#787) 2018-01-31 21:25:52 +01:00
omar
aa2dda7610 Nav: Tweak code to be easier to follow + updated todo list after clarifying an issue. 2018-01-31 21:06:47 +01:00
omar
e6c0b212e8 Nav: Fixed initial movement (which sends an InitRequest) from clearing NavDisableHighlight and fully enabling Nav feedbacks. (#787) 
NB: Setting g.NavInitResultExplicit = false on InitRequest match was added in initial commit c2cb2a6928
 2018-01-31 18:53:15 +01:00
omar
9c8fb804ed Log: Comments and extraneous assets to clarify intent. (#1584) 2018-01-31 17:41:26 +01:00
omar
27980d9688 Merge branch 'master' into context 2018-01-31 16:02:26 +01:00
omar
47e81a6194 Merge branch 'master' into navigation 2018-01-31 16:00:25 +01:00
omar
cd3dd886de Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ (#1569) 2018-01-31 16:00:07 +01:00
omar
23c11e9764 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 2018-01-31 15:43:19 +01:00
omar
596b6d6de2 Style: Enable window border by default. (#707) 2018-01-31 00:03:11 +01:00
omar
bebe03db05 Metrics: Minor formatting tweaks 2018-01-30 21:17:27 +01:00
omar
bd579e5429 Nav: Removed io.NavUsable --> io.NavActive, io.NavActive --> io.NavVisible. (#787). NavActive takes account of NavFlags enable flags. 2018-01-30 20:07:12 +01:00
omar
9fc6f5907b Nav: Fixed NavRectRel being cleared for one frame when restoring layer 0 with Alt/Menu key or Escape. Maybe was inconsequential. (#787) 2018-01-30 18:34:32 +01:00
omar
1ed7bce3ed Nav: Removed old unused code. (#787) 2018-01-30 18:34:17 +01:00
omar
a8763d14c5 Internals: Renaming. 2018-01-30 15:08:53 +01:00
omar
38197a236d Internals: Renaming. 2018-01-30 15:07:20 +01:00
omar
a7ad5134e5 Nav: window that are filling the entire display/viewport gets their windowing highlight clamped within. (#787) 2018-01-30 15:05:46 +01:00
omar
acf21ee429 Nav: Windows with ImGuiWindowFlags_NoBringToFrontOnFocus flag aren't temporarily displayed on the front when using CTRL-TAB. (#787) 2018-01-30 15:05:32 +01:00
omar
bed6ef03f5 Nav: workaround to kindly handle ALT-TAB without detecting TAB-release on backends that clear all keys on unfocus. (#787) 2018-01-29 23:59:47 +01:00
omar
c851b33352 Nav: Added proper version of ImGuiWindowFlags_NavFlattened that handles scrolling nicely. Marked as private as I'm not happy with the name. (#787) 2018-01-29 23:59:46 +01:00
omar
b40dc5c4f2 Nav: NavScoreItem uses g.CurrentWindow and not g.NavWindow. This was changed as part of b3cba62b80 when first trying to implement the NavFlattenedFlag. As it turns out we won't need it. Committing separately for safety. (#787) 2018-01-29 23:59:43 +01:00
omar
020b153d35 Nav: calling NavMoveRequestCancel() more consistently when hijacking a request. Not strictly necessary. (#787) 2018-01-29 23:59:43 +01:00
omar
c8d8dc7f0a Nav: Internals: Renamed RootNavWindow to NavRootWindow (#787) 2018-01-29 23:59:43 +01:00
omar
72485a5d04 Nav: Refactor NavMoveResult** flags into ImGuiNavMoveResult structure as we are going to want two instances of it. (#787) (+1 squashed commits) 
+ store window inside result.
 2018-01-29 23:59:42 +01:00
omar
1cf38d0334 Internals: Nav: Renamed ImGuiNavForward enum (#787) 2018-01-29 18:12:32 +01:00
omar
4654040bcb Nav: Comments, added enum to clarify NavForward code. (#787) 2018-01-29 17:35:36 +01:00
omar
c8b9b2c6bd Nav: Mouse hovering selectable / menu items only activate them if they are on the active NavLayer. (#787) 2018-01-29 15:46:41 +01:00
omar
21771adb94 Nav: Debug overlay uses default font. (#787) 2018-01-29 15:35:51 +01:00
omar
3ded262776 Merge branch 'master' into navigation 2018-01-26 16:07:43 +01:00
omar
2d9d7a10ca Scrollbar: Fix for ScrollbarY enable check after ScrollbarX has been enabled. (#1574) Looks like a bug introduced in c36e586cce. 2018-01-26 11:43:43 +01:00
omar
1f3b66b10a Scrollbar: Fix ScrollbarX enable test subtracting WindowPadding.x. This has been here since 65a191c005 (#246) tho at the time it is possible that SizeContents wasn't calculated as evenly. 
Test: auto-resize with: ImGui::Begin("Test", NULL, ImGuiWindowFlags_HorizontalScrollbar); ImGui::Button("##xxx", ImVec2(500,500)); ImGui::End();
 2018-01-26 11:43:31 +01:00
omar
10a4a77b27 Nav: Drag, Slider: When already past a limit and pushing in the direction of the limit, we don't clamp values again. (#787) 2018-01-25 20:39:34 +01:00
omar
04d5783ffd Nav: Cleaning up + using ImGuiInputSource source enum instead of a silly bool. (#787) 2018-01-25 19:36:38 +01:00
omar
d088bd86ad Nav: Added keyboard moving and resizing via the CTRL-TAB windowing mode. (#787) 2018-01-25 19:25:30 +01:00
omar
486f0a8ba0 Fixed potential warning (forward declaration and definition didn't match signature. forward declaration only here for consistency) 2018-01-25 19:07:35 +01:00
omar
f2d5300408 Nav: Keyboard: Added CTRL+TAB (and CTRL+Shift+TAB) style window selection. (#787) 2018-01-25 19:03:47 +01:00
omar
ed088b00be Nav: Style: Improved display of windowing highlight (for focus selection via PadMenu or Ctrl+TAB). (#787, #707) 2018-01-25 18:50:30 +01:00
omar
e9070e768e Nav: Fixed renaming of c09016b12a that were incorrect. ImGuiNavInput_PadLeft -> PadDpadLeft, _PadScrollLeft -> PadLStickLeft. (#787) 2018-01-25 16:17:36 +01:00
omar
5d31e1696f Fix SetNextWindowContentSize() with 0.0f on Y axis (or SetNextWindowContentWidth()) overwriting the contents size. Broken in eab6333a0b. (#1363) 2018-01-25 15:37:24 +01:00
omar
5f7f27c8de Nav: Comments. (#787) 2018-01-24 20:07:35 +01:00
omar
d404b93b6b Nav: Mouse clicking on a window (to select/move) disables hides nav highlight. (#787) + comments 2018-01-24 19:57:39 +01:00
omar
89b0ca1f8f Nav: FocusWindow() doesn't reset NavRectRel (which was flickering e.g. when returning to a parent menu). This was added in the initial nav branch commit and I don't see a reason for it. (#787) 2018-01-24 19:55:56 +01:00
omar
f3776055d6 Merge branch 'master' into context 2018-01-24 19:31:11 +01:00
omar
455989b8b1 Nav: Added io.NavFlags to hold various options. Added ImGuiNavFlags_EnableGamepad and ImGuiNavFlags_EnableKeyboard for bindings to use (#787) 2018-01-24 17:41:47 +01:00
omar
28671aa821 Nav: Internals: Moved some enums and functions to internals, renamed ImGuiNavReadMode to ImGuiInputReadMode as well. (#787) 2018-01-24 17:41:47 +01:00
omar
8227176c17 Nav: Menus: Fix for using Left direction inside a menu with widgets layed out horizontally. Left to close is now handled as a fallback inside EndMenu(). (#787) 2018-01-24 17:41:47 +01:00
omar
c09016b12a Nav: Renamed ImGuiNavInput_PadLeft / etc. to ImGuiNavInput_PadLStickLeft. Renamed ImGuiNavInput_PadScrollLeft to ImGuiNavInput_PadRStickLeft, aka removing trying-too-hard semantic from the enums. (#787) 2018-01-24 17:41:47 +01:00
omar
bd278e958e Nav: Added ImGuiNavInput_KeyLeft/Right/Up/Down set so we can differenciate gamepad/keyboard inputs. (#787) 2018-01-24 17:41:47 +01:00
ocornut
680162eb32 Merge branch 'master' into navigation 2018-01-24 17:41:14 +01:00
omar
5148937d4d Fixed old Begin() calling SetNextWindowBgAlpha() with negative values. (#1567, #1568) 2018-01-24 17:39:21 +01:00
omar
37ee99983f Clear BgAlphaCond properly after consuming it. Fixes 9a76fd30fd (#1567) 2018-01-24 15:09:02 +01:00
omar
64b786c2aa Nav: Tweak/fixed popup positioning when using nav without the io.NavMovesMouse flag (it was always assuming a mouse cursor and allocating space for it) (#787) 
Note that this bit include badly hardcoded sizes, expecting an improvement later.
 2018-01-24 10:31:54 +01:00
omar
cea78cc576 Nav: Update hovered logic, so IsItemHovered and ButtonBehavior are more consistent with each other. The known case this fixes is nav focusing on a color button, tooltip appears, mouse move: previously tooltip would stay up. (#787) 2018-01-24 10:24:41 +01:00
omar
eb7ec781dc Nav: Tweak GetNavInputAmount(). Split debug defines. 2018-01-23 21:56:15 +01:00
omar
f6ee8d30fb Comments (#1567) 2018-01-23 19:21:17 +01:00
omar
d500113f1d Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
 2018-01-23 19:16:43 +01:00
omar
9a76fd30fd Added SetNextWindowBgAlpha() helper. (#1567) particularly helpul with the marking of the old 5-parameters version of Begin() as obsolete. 2018-01-23 19:13:49 +01:00
omar
13c407591e Nav: Comments, tweaks 2018-01-23 16:45:46 +01:00
omar
db2ba13154 Internals: Exposed SetCurrentFont() in imgui_internal.h 2018-01-23 16:33:06 +01:00
omar
9076366c17 Style: Exposed ImGuiStyleVar_WindowTitleAlign, ImGuiStyleVar_ScrollbarSize, ImGuiStyleVar_ScrollbarRounding, ImGuiStyleVar_GrabRounding + added an assert to reduce accidental breakage. (#1181) 2018-01-23 09:57:49 +01:00
omar
1acb155419 Internals: Moved unnecessary MovingWindowMoveId field. 2018-01-22 14:31:20 +01:00
omar
5097368bd5 Tweaked FAQ. 2018-01-22 12:01:24 +01:00
omar
2026e792cd Context: NewFrame() asserts (#1565) 2018-01-21 21:12:52 +01:00
omar
9edf211c0e Merge branch 'master' into navigation 2018-01-21 20:46:50 +01:00
omar
3ed2ddbfbe Metrics: Removed context size display. 2018-01-21 20:32:05 +01:00
omar
5e2aa6185c Reorganized context handling to be more explicit, 
- YOU NOW NEED TO CALL ImGui::CreateContext() AT THE BEGINNING OF YOUR APP, AND CALL ImGui::DestroyContext() AT THE END.
- removed Shutdown() function, as DestroyContext() serve this purpose.
- you may pass a ImFontAtlas* pointer to CreateContext() to share a font atlas between contexts. Otherwhise CreateContext() will create its own font atlas instance.
- removed allocator parameters from CreateContext(), they are now setup with SetAllocatorFunctions(), and shared by all contexts.
- removed the default global context and font atlas instance, which were confusing for users of DLL reloading and users of multiple contexts
(#1565, #586, #992, #1007, #1558)
 2018-01-21 20:16:54 +01:00
omar
7e4d28a49d Context: Renamed SetMemoryAllocators() to SetAllocatorFunctions(). Tweaked comments. (#1565, #586, #992, #1007, #1558) 2018-01-21 20:16:54 +01:00
omar
e45d7a7060 Context: Added IMGUI_DISABLE_DEFAULT_ALLOCATORS to disable linking with malloc/free. (#1565, #586, #992, #1007, #1558) 2018-01-21 20:16:54 +01:00
omar
5a301c29dc Context: Removed allocator parameters from CreateContext(), they are now setup with SetMemoryAllocators() and shared by all contexts. (#1565, #586, #992, #1007, #1558) 2018-01-21 20:16:54 +01:00
omar
ac5b7a1bdf Comments 2018-01-21 20:10:23 +01:00
Panos Karabelas
7c8a19978d Simplified return of ImGui::IsKeyReleased() 2018-01-21 16:02:09 +00:00
omar
cd1409f4bf ImFontAtlas: Moved mouse cursor data out of ImGuiContext, fix drawing them with multiple context. Also remove the last remaining undesirable dependency on GImGui in imgui_draw.cpp, finishing the work recently done with ImDrawListSharedData. Hurra! (#939) 2018-01-20 20:25:12 +01:00
omar
0b1fecb792 Horizontal mouse wheel: renamed io.MouseHorizWheel to io.MouseWheelH. Reorganized the code in NewFrame(). Examples: Updated GLFW+GL and SDL+GL accordingly. (#1463) 2018-01-20 12:36:16 +01:00
omar
6f6b6194b2 Merge branch 'tseeker/20171127-feature-horiz-wheel' of https://github.com/tseeker/imgui into tseeker-tseeker/20171127-feature-horiz-wheel 
# Conflicts:
#	examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
 2018-01-20 12:06:06 +01:00
omar
d4bf9b4686 Renaming for consistency. 2018-01-19 15:47:10 +01:00
omar
8877622fa8 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 2018-01-19 15:42:28 +01:00
omar
e5a6e85f6d Basic undocumented/unsupported combination of Child+Tooltip. The full feature needs substancially more work but this is enough for simplest cases. (#1345) 2018-01-19 15:37:25 +01:00
omar
42a612d7c9 Begin: Removed asserts that got in the way of some flags combination. (#1345) 2018-01-19 15:33:35 +01:00
omar
0978f00911 MovingWindow: Track click offset based on root window (undo 514d30d8cd). This should not affect the patch used for #1345 as the RootWindow for Child+Tooltip window points to itself now. 2018-01-19 15:14:53 +01:00
omar
74dc70c543 DragFloat: Fix/workaround for backends which do not preserve a valid mouse position when dragged out of bounds. (#1559) 2018-01-19 09:16:26 +01:00
omar
63d47e8328 Drag and Drop: Increased payload type string to 12 characters instead of 8.(#143) 2018-01-18 17:32:34 +01:00
omar
932d3f0198 NewFrame(): Added an assert to detect incorrect filling of the io.KeyMap[] array earlier. (#1555) + comments. 2018-01-18 10:06:58 +01:00
omar
7ccbb765e2 InputText: Cursor X position not lost when clicking outside on an item that's submitted after the InputText(). It was only noticeable when restoring focus programmatically. (#1418, #1554) 2018-01-17 12:15:00 +01:00
omar
2f15cc0855 Nav: Fixed popup wrap-around logic for windows with scrolling. (#787) 2018-01-15 21:55:32 +01:00
omar
05885b2e6d Merge fix. 2018-01-15 20:18:01 +01:00
omar
472ba1394c Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 2018-01-15 20:13:42 +01:00
omar
28a76af185 Internal: DrawData: Tidying, renaming. 2018-01-15 20:12:48 +01:00
omar
a77913054f Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 2018-01-15 18:02:58 +01:00