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
|
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
|
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
|
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
|
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 |
|
omar
|
1182174d81
|
Internals: DrawData: We don't need an intermediate layer for popups.
|
2018-01-15 18:00:13 +01:00 |
|
omar
|
0c06b43e6b
|
Metrics: Tweaks to hover-window-drawlist to see window bounding box.
|
2018-01-15 17:55:38 +01:00 |
|
omar
|
038453258e
|
Internals: DrawData: Refactored chunks into a ImDrawDataBuilder we can reuse.
|
2018-01-15 17:48:32 +01:00 |
|
omar
|
06eef2ce6f
|
Internals: DrawData: renamed fields only (committing separately so that next commit is less nosiy).
|
2018-01-15 17:48:32 +01:00 |
|
omar
|
6eff21ee5e
|
Revert "Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7. (#787)"
This reverts commit 03f5cd6ca1.
|
2018-01-15 16:19:01 +01:00 |
|
omar
|
514d30d8cd
|
MovingWindow: Track click offset based on MovingWindow and not its RootWindow. Followup to 3849bb4470. Comments + adding a local to ease patch #1345.
|
2018-01-14 14:13:54 +01:00 |
|
Crunkle
|
daa38f2ad0
|
Fix cross compilers
|
2018-01-14 03:31:22 +00:00 |
|
omar
|
db63e71f13
|
Internals: Exposed SetCurrentFont() in imgui_internal.h
|
2018-01-12 20:07:01 +01:00 |
|
omar
|
1493de4f81
|
Internals: Merge of harmless stuff from Navigation stuff. Added GetHoveredID() internal helper.
|
2018-01-12 19:53:27 +01:00 |
|
omar
|
c85d7d6e49
|
Nav: Remove GetItemID(), hide ActivateItem() before this feature is unfinished and has issue (full feature is on hold). Undo part of 59c6f35bf6 (#787)
|
2018-01-12 19:28:37 +01:00 |
|
omar
|
c9be7d7254
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-01-12 19:21:12 +01:00 |
|
omar
|
0a98202714
|
Nav: Standardized FIXME-NAV marker.
|
2018-01-12 19:13:15 +01:00 |
|
omar
|
cc173d7619
|
Begin: FIx previous commit - no need to call on collapsed window. Handle manual resize (grip, border, gamepad) before setting up window DrawList main clipping rectangle. Sane (and required for viewport code). (#822, #1542)
|
2018-01-11 23:21:24 +01:00 |
|
omar
|
5e9ae92ae9
|
Begin: Handle manual resize (grip, border, gamepad) before setting up window DrawList main clipping rectangle. Sane (and required for viewport code). (#822, #1542)
|
2018-01-11 23:17:34 +01:00 |
|
omar
|
f7b10fc954
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2018-01-11 18:18:44 +01:00 |
|
omar
|
6a1011cf53
|
MovingWindow: Proper fix for 651538e attempt, without altering MovingWindow which has side-effects. Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337)
|
2018-01-11 18:16:16 +01:00 |
|
omar
|
b74f24c3e5
|
Revert "Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337)"
This reverts commit 651538e13b.
|
2018-01-11 18:08:14 +01:00 |
|
omar
|
1c95dea88c
|
Merge branch 'master' into navigation
|
2018-01-11 17:37:02 +01:00 |
|
omar
|
7d2a068dea
|
Begin: Shuffling bits of code around.
|
2018-01-11 17:33:37 +01:00 |
|
omar
|
cd7e178eac
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2018-01-11 16:49:59 +01:00 |
|
omar
|
651538e13b
|
Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337)
|
2018-01-11 16:43:03 +01:00 |
|
omar
|
a63fbbca8b
|
Added ImGuiHoveredFlags_AnyWindow, ImGuiFocusedFlags_AnyWindow. Obsoleted IsAnyWindowHovered()/IsAnyWindowFocused() in favor of IsWindowHovered(ImGuiHoveredFlags_AnyWindow)/IsWindowFocused(ImGuiFocusedFlags_AnyWindow). Added to demo. (#1382)
|
2018-01-11 13:51:18 +01:00 |
|