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)
omar2018-01-11 23:21:24 +01:00
5e9ae92ae9
Begin: Handle manual resize (grip, border, gamepad) before setting up window DrawList main clipping rectangle. Sane (and required for viewport code). (#822, #1542)
omar2018-01-11 23:17:34 +01:00
f7b10fc954
Merge branch 'master' into navigation
omar2018-01-11 18:18:44 +01:00
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)
omar2018-01-11 18:16:16 +01:00
b74f24c3e5
Revert "Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337)"
omar2018-01-11 18:08:14 +01:00
1c95dea88c
Merge branch 'master' into navigation
omar2018-01-11 17:37:02 +01:00
7d2a068dea
Begin: Shuffling bits of code around.
omar2018-01-11 17:33:37 +01:00
cd7e178eac
Merge branch 'master' into navigation
omar2018-01-11 16:49:59 +01:00
651538e13b
Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337)
omar2018-01-11 16:43:03 +01:00
a8bbb0b7dd
Demo: Using IM_COL32() instead of ImColor() in ImDrawList centric contexts.
omar2018-01-11 15:47:07 +01:00
398a4e1865
Made obsolete IsAnyWindowHovered()/IsAnyWindowFocused() static inline. static only tends to trigger warnings. (#1382)
omar2018-01-11 13:58:25 +01:00
a63fbbca8b
Added ImGuiHoveredFlags_AnyWindow, ImGuiFocusedFlags_AnyWindow. Obsoleted IsAnyWindowHovered()/IsAnyWindowFocused() in favor of IsWindowHovered(ImGuiHoveredFlags_AnyWindow)/IsWindowFocused(ImGuiFocusedFlags_AnyWindow). Added to demo. (#1382)
omar2018-01-11 13:49:32 +01:00
67671c0ab5
Merge branch 'master' into navigation
omar2018-01-10 23:11:26 +01:00
1eee10778b
Internals: Begin: Refactor some code into an UpdateManualResize() function.
omar2018-01-10 23:06:51 +01:00
483f9b0d07
Internals: Begin: Moved DrawList setup code below, the viewport system will need to push the outer clipping rectangle as late as possible.
omar2018-01-10 22:55:29 +01:00
92d75c44bc
Internals: ImVec2 versions of ImMin, ImMax inline float version for a faster full-on-debug-no-inline experience.
omar2018-01-08 23:59:12 +01:00
fe919995da
Merge branch 'master' into navigation
omar2018-01-08 16:35:12 +01:00
3f4eccf154
Merge branch 'master' into navigation
omar2018-01-07 16:22:09 +01:00
3fc7cf190d
OpenPopup(): Always reopen existing popup. Removed OpenPopupEx() bool reopen_existing which is always true. This also makes the public API on par with OpenPopupEx(). (#1497, #1533)
omar2018-01-07 16:20:02 +01:00
deab2ab015
Popups: Gently handle the user mistakenly calling OpenPopup() every frame. (when reopen_existing is true). (#1497)
omar2018-01-07 16:15:54 +01:00
e09852fc49
Popups: Revert aca23fd3f0 (Oct 20, 2017). Because 1) I can't seem to find a default. 2) The if is definitively faulty and would have been all true. 3) It looks like possibly the following commit 6ab737a4bb could have made this unnecessary. Not absolutly certain. (~#439)
omar2018-01-07 15:34:15 +01:00
63e4677b81
Popup: BeginPopupContextItem(), BeginPopupContextWindow(), BeginPopupContextVoid(), OpenPopupOnItemClick() all react on mouse release instead of mouse click. Note that they don't use the full ButtonBehavior() or tracking aabb on both click and release. Applications I've tried seems to behave inconsistently there but on-release-without-tracking is both fairly common and doesn't require extra code for the id tracking. (~#439)
omar2018-01-07 15:22:54 +01:00
c337cdcfd3
Internal: ButtonBehavior: Tweak to update g.ActiveIdClickOffset more consistently
omar2018-01-07 15:02:09 +01:00
d730a763f6
Internal: Reworked FocusFrontMostActiveWindow() so it fits the Nav branch usage as well.
omar2018-01-07 14:32:42 +01:00
66b2ee6ea2
Merge branch 'master' into navigation
omar2018-01-07 14:25:05 +01:00
a34490239c
Internals: Popup: Separating MousePosOnOpen and PopupPosOnOpen. They are equal in the master branch but different in the navigation branch.
omar2018-01-07 13:51:36 +01:00
5fd19f037f
Internals: renamed FocusPreviousWindow() to FocusfrontMostActiveWindow()
omar2018-01-07 12:34:52 +01:00
2874aabb93
Internals: BringWindowToFront() iterate front to back, faster in majority of use cases.
omar2018-01-07 12:29:54 +01:00
95b773370f
Revert "Internals: Added LastActiveId, LastActiveIdTimer. (#1537)" Will come up with a better design later. This reverts commit 007f4034c9.
omar2018-01-05 17:39:53 +01:00
4c90529c62
Examples: Visual Studio projects: Disabled extraneous function-level check in Release build.
omar2018-01-04 11:42:05 +01:00
ecbfdd3143
Added extraneous initialization to NULL. (#1527).
omar2018-01-04 11:06:12 +01:00
29c194b2a4
Merge branch 'master' into navigation
omar2018-01-03 20:47:42 +01:00
4fc9f44073
Merge of minor left-overs from private work branch to reduce drifts. Should be functionally a no-op.
omar2018-01-03 20:45:06 +01:00
4b1240b2e1
Fixed non-popup child windows not honoring the HiddenFrames flag (can't see a reason). Docking relies on this.
omar2017-11-23 18:18:56 +01:00
b2ec0741f1
Internals: Settings api tweaks
omar2017-12-15 20:59:00 +01:00
2b8224692e
Merge branch 'master' into navigation
omar2018-01-03 20:26:24 +01:00
0a0b252bb6
DragDrop: Removed IsDragDropActive() (introduced a few days ago, revert 06bea369c0) as our use case doesn't need it anymore. Will add it if there is a real need.
omar2018-01-03 16:56:41 +01:00
a7deb3a394
Demo: Minor tweaks.
omar2018-01-03 15:36:51 +01:00
96ccc484f9
Merge branch 'master' into navigation
omar2018-01-03 12:33:27 +01:00
3c6fbe0849
Renamed ImGuiSizeConstraintCallback to ImGuiSizeCallback, ImGuiSizeConstraintCallbackData to ImGuiSizeCallbackData.
omar2018-01-03 12:31:56 +01:00
7fcbd45500
Internals: NextWindow: Renamed, moved functions to member.
omar2018-01-03 12:28:16 +01:00
e339949de1
Internals: NextWindow: Using ImGuiCond for consistency.
omar2018-01-03 12:22:02 +01:00
04b44398eb
Internals: refactored g.SetNextWindow fields into g.NextWindow. structure (so it can be more easily transported/copied)
omar2018-01-03 12:12:41 +01:00
561e9f286e
Fix a memory leak of ImGuiColumnsSet's Columns vector. ImVector doesn't call destructors.
Cory McWilliams2018-01-02 10:46:20 -05:00
170bcb2d7c
Internals: NewFrame: Shuffled some code around (to minimize upcoming patches)
omar2017-12-29 20:56:52 +01:00
4af84ac781
ImFontAtlas: Handle stb_truetype failure more gracefully, GetTexDataAsRGBA32() won't crash during conversion. (#1527)
omar2017-12-30 23:10:11 +01:00
7a15fc8de5
Merge branch 'master' into navigation
omar2017-12-29 18:28:23 +01:00
6ec00a366a
Internals: ImRect: Minor formatting tweaks.
omar2017-12-29 18:28:04 +01:00
fbf2435f38
Exposed IM_OFFSETOF() helper in imgui.h
omar2017-12-29 17:18:31 +01:00
eef9120e07
Reorganized comments in the IMGUI_DISABLE_OBSOLETE_FUNCTIONS function. Added an IM_ASSERT(0).
omar2017-12-29 18:14:36 +01:00
2dd2ca0096
Removed CalcItemRectClosestPoint() which was weird and not really used by anyone except demo code. If you need it it's easy to replicate on your side. Removed internal corresponding ImRect::GetClosestPoint() for now. Essentially revert dcaafffe0e.
omar2017-12-29 17:59:13 +01:00
9f8632b131
Examples: Comments about invalid mouse pos.
omar2017-12-29 15:03:36 +01:00
c4e6d622c1
Merge branch 'master' into navigation
omar2017-12-29 13:39:07 +01:00
4fbdb50dca
MenuBar: Fixed menu bar pushing a clipping rect outside of its allocated bound (usually unnoticeable).
omar2017-12-28 23:51:58 +01:00
4ba2e85744
Demo: Tweak. Comments. Metrics: Added some Drag and Drop info.
omar2017-12-28 23:50:37 +01:00
90ff4ae5d1
BeginPopupModal(): the conditional test for SetNextWindowPos() was polling the wrong window, which in practice made the test succeed all the time.
omar2017-12-28 23:08:48 +01:00
e985baa35d
Combo: When peeking into the popup window for alignment we check if the window was active, which is more correct. (no known issue in current codebase, but we'll need that change for later)
omar2017-12-28 17:05:52 +01:00
06bea369c0
DragDrop: Added IsDragDropActive() helper which is useful for binding to decide how to handle mouse inputs.
omar2017-12-28 16:54:16 +01:00
563d04fdb1
TreeNode: node with the ImGuiTreeNodeFlags_Leaf flag correctly disable highlight when DragDrop is active. (#143, #581)
omar2017-12-28 15:29:06 +01:00
49eed6e2d1
Version 1.54 WIP
omar2017-12-28 15:17:35 +01:00
436cad4bca
Merge branch 'master' into navigation
omar2017-12-26 15:37:31 +01:00
d9034bf2d8
ListBox() changed signature of ListBox() to match Combo(). Still not very happy about not using const char** anymore. (#931)
omar2017-12-26 15:36:55 +01:00
149523a101
Fixing error: declaration of ‘size’ shadows a member of 'this' [-Werror=shadow]
Branimir Karadžićandomar2017-12-25 12:31:23 -08:00
9511f22e8b
Demo: Console: More friendly to text color changes.
omar2017-12-25 18:47:44 +01:00