omar
|
b32bb4e6e3
|
Removed DisplayVisibleMin/DisplayVisibleMax facility (as part of # 1542). Misc comments.
|
2018-02-27 22:55:18 +01:00 |
|
omar
|
0e62b7d68a
|
Clearing next window data at the end of Begin() more reliably. Misc comments.
|
2018-02-27 22:47:45 +01:00 |
|
omar
|
a761779b12
|
Internals: Settings: Added ReadCloseFn to allow handlers to sanitize data on a per-entry basis.
|
2018-02-27 22:32:45 +01:00 |
|
omar
|
3f335b0d42
|
Merge branch 'master' into examples_refactor
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
|
2018-02-26 18:22:36 +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
|
e6bc840f6f
|
Merge branch 'master' into examples_refactor
|
2018-02-23 10:47:32 +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
|
91cadc1130
|
Merge branch 'master' into examples_refactor
|
2018-02-21 22:47:03 +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
|
bcdfd5d61c
|
Merge branch 'master' into examples_refactor
|
2018-02-20 16:18:02 +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
|
45cbebad64
|
Added dummy io.DisplayPos field.
|
2018-02-18 21:04:17 +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 |
|