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
|
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 |
|