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 |
|
omar
|
67671c0ab5
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2018-01-10 23:11:26 +01:00 |
|
omar
|
1eee10778b
|
Internals: Begin: Refactor some code into an UpdateManualResize() function.
|
2018-01-10 23:06:51 +01:00 |
|
omar
|
483f9b0d07
|
Internals: Begin: Moved DrawList setup code below, the viewport system will need to push the outer clipping rectangle as late as possible.
|
2018-01-10 22:55:29 +01:00 |
|
omar
|
03f5cd6ca1
|
Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7 . (#787)
|
2018-01-10 18:58:55 +01:00 |
|
omar
|
919fc548ad
|
Merge branch 'master' into navigation
|
2018-01-10 18:58:26 +01:00 |
|
omar
|
6c583315e6
|
Begin: Moving some code around for the benefits of the wip viewport branch.
|
2018-01-10 18:56:51 +01:00 |
|
omar
|
f610e25682
|
Internals: Using ImFloor().when appropriate.
|
2018-01-10 18:33:29 +01:00 |
|
omar
|
fe919995da
|
Merge branch 'master' into navigation
|
2018-01-08 16:35:12 +01:00 |
|
omar
|
933ee6cd5d
|
InputText: Added alternative clipboard shortcuts: Shift+Delete (cut), Ctrl+Insert (copy), Shift+Insert (paste). (#1541)
|
2018-01-08 16:01:30 +01:00 |
|
omar
|
fd4d63a0c5
|
InputText: Moved code for checking clipboard shortcut so we can expand on it. (#1541)
|
2018-01-08 15:56:01 +01:00 |
|
omar
|
168200f915
|
Popups: Comments, reorganize bits of the header section, renamed parameters.
|
2018-01-07 18:17:47 +01:00 |
|
omar
|
a8e5542d78
|
BeginPopup: Exposed extra_flags publicly. (#1533)
|
2018-01-07 18:13:01 +01:00 |
|
omar
|
3f4eccf154
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2018-01-07 16:22:09 +01:00 |
|
omar
|
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)
|
2018-01-07 16:20:02 +01:00 |
|
omar
|
deab2ab015
|
Popups: Gently handle the user mistakenly calling OpenPopup() every frame. (when reopen_existing is true). (#1497)
|
2018-01-07 16:15:54 +01:00 |
|
omar
|
69ff65f054
|
Internals: Popup: Renaming fields.
|
2018-01-07 16:11:25 +01:00 |
|
omar
|
3678307cd9
|
Popup, Menus: Tweaks and comments.
|
2018-01-07 15:56:14 +01:00 |
|
omar
|
369189b675
|
Internals: Popup: Explicitely setting up ImGuiPopupRef reduces confusion.
|
2018-01-07 15:40:46 +01:00 |
|
omar
|
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)
|
2018-01-07 15:34:15 +01:00 |
|
omar
|
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)
|
2018-01-07 15:23:57 +01:00 |
|
omar
|
c337cdcfd3
|
Internal: ButtonBehavior: Tweak to update g.ActiveIdClickOffset more consistently
|
2018-01-07 15:02:09 +01:00 |
|
omar
|
7ad169fa09
|
Merge branch 'master' into navigation + fix previous merge
# Conflicts:
# imgui.cpp
|
2018-01-07 14:33:44 +01:00 |
|
omar
|
d730a763f6
|
Internal: Reworked FocusFrontMostActiveWindow() so it fits the Nav branch usage as well.
|
2018-01-07 14:32:42 +01:00 |
|
omar
|
66b2ee6ea2
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2018-01-07 14:25:05 +01:00 |
|
omar
|
a34490239c
|
Internals: Popup: Separating MousePosOnOpen and PopupPosOnOpen. They are equal in the master branch but different in the navigation branch.
|
2018-01-07 14:03:56 +01:00 |
|
omar
|
5fd19f037f
|
Internals: renamed FocusPreviousWindow() to FocusfrontMostActiveWindow()
|
2018-01-07 12:48:11 +01:00 |
|
omar
|
2874aabb93
|
Internals: BringWindowToFront() iterate front to back, faster in majority of use cases.
|
2018-01-07 12:48:11 +01:00 |
|
omar
|
95b773370f
|
Revert "Internals: Added LastActiveId, LastActiveIdTimer. (#1537)" Will come up with a better design later.
This reverts commit 007f4034c9 .
|
2018-01-05 17:40:51 +01:00 |
|
omar
|
007f4034c9
|
Internals: Added LastActiveId, LastActiveIdTimer. (#1537)
|
2018-01-05 15:33:24 +01:00 |
|
omar
|
29c194b2a4
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2018-01-03 20:47:42 +01:00 |
|
omar
|
4fc9f44073
|
Merge of minor left-overs from private work branch to reduce drifts. Should be functionally a no-op.
|
2018-01-03 20:46:54 +01:00 |
|
omar
|
4b1240b2e1
|
Fixed non-popup child windows not honoring the HiddenFrames flag (can't see a reason). Docking relies on this.
|
2018-01-03 20:45:24 +01:00 |
|
omar
|
b2ec0741f1
|
Internals: Settings api tweaks
|
2018-01-03 20:45:17 +01:00 |
|
omar
|
2b8224692e
|
Merge branch 'master' into navigation
|
2018-01-03 20:26:24 +01:00 |
|
omar
|
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.
|
2018-01-03 17:02:51 +01:00 |
|
omar
|
33f7769d85
|
Columns: Clear offsets data when columns count changed. (#1525)
|
2018-01-03 14:38:01 +01:00 |
|
omar
|
f9b2058d5a
|
Internals: Renamed ImGuiSimpleColumns to ImGuiMenuColumns to avoid confusion. Reduced internal buffer size (we only use 3 slots).
|
2018-01-03 14:35:11 +01:00 |
|
omar
|
05ec0b0736
|
Casing tweaks + clarify license copyright (simpler/safer?) (#1346)
|
2018-01-03 14:32:16 +01:00 |
|
omar
|
96ccc484f9
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_internal.h
|
2018-01-03 12:33:27 +01:00 |
|
omar
|
3c6fbe0849
|
Renamed ImGuiSizeConstraintCallback to ImGuiSizeCallback, ImGuiSizeConstraintCallbackData to ImGuiSizeCallbackData.
|
2018-01-03 12:31:56 +01:00 |
|
omar
|
7fcbd45500
|
Internals: NextWindow: Renamed, moved functions to member.
|
2018-01-03 12:28:16 +01:00 |
|
omar
|
e339949de1
|
Internals: NextWindow: Using ImGuiCond for consistency.
|
2018-01-03 12:22:02 +01:00 |
|
omar
|
04b44398eb
|
Internals: refactored g.SetNextWindow fields into g.NextWindow. structure (so it can be more easily transported/copied)
|
2018-01-03 12:12:41 +01:00 |
|
omar
|
7e03ee8d85
|
Merge branch 'master' into navigation
|
2018-01-02 17:21:49 +01:00 |
|
Cory McWilliams
|
561e9f286e
|
Fix a memory leak of ImGuiColumnsSet's Columns vector. ImVector doesn't call destructors.
|
2018-01-02 10:46:20 -05:00 |
|
omar
|
170bcb2d7c
|
Internals: NewFrame: Shuffled some code around (to minimize upcoming patches)
|
2018-01-02 12:48:38 +01:00 |
|
omar
|
7a15fc8de5
|
Merge branch 'master' into navigation
|
2017-12-29 18:28:23 +01:00 |
|
omar
|
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 .
|
2017-12-29 17:59:13 +01:00 |
|
omar
|
c4e6d622c1
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
|
2017-12-29 13:39:07 +01:00 |
|
omar
|
4fbdb50dca
|
MenuBar: Fixed menu bar pushing a clipping rect outside of its allocated bound (usually unnoticeable).
|
2017-12-28 23:53:36 +01:00 |
|
omar
|
4ba2e85744
|
Demo: Tweak. Comments. Metrics: Added some Drag and Drop info.
|
2017-12-28 23:53:27 +01:00 |
|
omar
|
90ff4ae5d1
|
BeginPopupModal(): the conditional test for SetNextWindowPos() was polling the wrong window, which in practice made the test succeed all the time.
|
2017-12-28 23:52:47 +01:00 |
|
omar
|
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)
|
2017-12-28 23:52:42 +01:00 |
|
omar
|
06bea369c0
|
DragDrop: Added IsDragDropActive() helper which is useful for binding to decide how to handle mouse inputs.
|
2017-12-28 23:52:37 +01:00 |
|
omar
|
563d04fdb1
|
TreeNode: node with the ImGuiTreeNodeFlags_Leaf flag correctly disable highlight when DragDrop is active. (#143, #581)
|
2017-12-28 23:52:31 +01:00 |
|
omar
|
49eed6e2d1
|
Version 1.54 WIP
|
2017-12-28 15:17:35 +01:00 |
|
omar
|
436cad4bca
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.h
|
2017-12-26 15:37:31 +01:00 |
|
omar
|
d9034bf2d8
|
ListBox() changed signature of ListBox() to match Combo(). Still not very happy about not using const char** anymore. (#931)
|
2017-12-26 15:36:55 +01:00 |
|
omar
|
e916310b2e
|
Version 1.53
|
2017-12-25 17:41:41 +01:00 |
|
omar
|
ed2105d4a2
|
Merge branch 'master' into navigation
|
2017-12-25 16:45:27 +01:00 |
|
omar
|
3849bb4470
|
Moving window doesn't use accumulating MouseDelta so straying out of boundaries keeps moved window at the same spot.
|
2017-12-25 16:03:58 +01:00 |
|
omar
|
de5c304b49
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-12-24 18:59:40 +01:00 |
|
omar
|
8d54b1b7af
|
Misc comments, removed duplicated IM_ARRAYSIZE macro in imgui_demo.cpp (it is now declared in imgui.h)
|
2017-12-24 18:59:14 +01:00 |
|
omar
|
1b86e7343f
|
Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).
|
2017-12-24 18:16:22 +01:00 |
|
omar
|
cead207535
|
Comments
|
2017-12-24 17:58:41 +01:00 |
|
omar
|
6c63c7a8b1
|
Various zealous warning fixes (thanks Clang). (Navigation branch)
|
2017-12-23 16:40:12 +01:00 |
|
omar
|
ffb4f6ca8c
|
Merge branch 'master' into navigation
|
2017-12-23 16:27:48 +01:00 |
|
omar
|
9cda86d55a
|
Internals: Added IM_NEW, IM_DELETE helper macros (#1517, #484, #504)
|
2017-12-23 16:24:33 +01:00 |
|
omar
|
983d8f5f8e
|
Various zealous warning fixes (Clang).
|
2017-12-23 15:28:49 +01:00 |
|
omar
|
53b24ff79a
|
Removed reliance on ImU64 type for the ImDrawList assert. (#1184)
|
2017-12-23 15:02:36 +01:00 |
|
omar
|
1f26652944
|
Various zealous warning fixes (thanks Clang).
|
2017-12-23 14:07:03 +01:00 |
|
omar
|
1c1e490316
|
Merge branch 'master' into navigation
|
2017-12-22 20:21:54 +01:00 |
|
omar
|
46dcd9aa50
|
Columns: Made PixelsToOffsetNorm() properly symetrical to OffsetNormToPixels() (#125)
|
2017-12-22 20:21:35 +01:00 |
|
omar
|
471bcf8b5e
|
Columns: Fixed dragging when using a same of columns multiple times in the frame. (#125)
|
2017-12-22 20:21:02 +01:00 |
|
omar
|
e1a103b251
|
Drag and Drop: Disable tracking mouse button ownership when an external drag source is active, to make it easier to achieve drag and drop over multiple OS windows. (#143)
|
2017-12-22 20:20:52 +01:00 |
|
omar
|
8d21ee56d2
|
ImDrawList, Font: Fixed bug introduced in 531c11d5c7 (#1519)
|
2017-12-22 20:19:48 +01:00 |
|
omar
|
287380261c
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-12-21 19:55:21 +01:00 |
|
omar
|
c8c872c753
|
Internals: String functions uses size_t in their signature
|
2017-12-21 19:49:54 +01:00 |
|
omar
|
996dfb21cf
|
ImDrawList: Added ImDrawListFlags for AA settings. ImDrawList doesn't directly depends on GImGui anymore.
|
2017-12-21 19:49:54 +01:00 |
|
omar
|
d139bd088d
|
Begin: Moved modal darkening draw block
|
2017-12-21 19:49:54 +01:00 |
|
omar
|
14cb8177d0
|
ImDrawList: Removed 'bool anti_aliased = true' final parameter of ImDrawList::AddPolyline() and ImDrawList::AddConvexPolyFilled(). Anti-aliasing is controlled via the regular style.AntiAliased flags.
|
2017-12-21 19:01:53 +01:00 |
|
omar
|
531c11d5c7
|
ImDrawList: Small refactor toward removing dependency on GImGui + PushClipRectFullscreen now correctly uses data provided by imgui which can takes account of DisplaySize + Removed static variable in PathArcToFast() which caused linking issues to some.
|
2017-12-21 18:52:34 +01:00 |
|
omar
|
230f826ef5
|
ImDrawList: Comments
|
2017-12-21 18:48:09 +01:00 |
|
omar
|
4c2514dc29
|
Merge branch 'master' into navigation
|
2017-12-21 11:18:42 +01:00 |
|
omar
|
6193f46af2
|
Active Modal window always set the WantCaptureKeyboard flag (#744)
|
2017-12-21 11:18:30 +01:00 |
|
omar
|
b366dd9322
|
BeginPopup: Moved flags into individual BeginPopupXXX calls/implementations and outside of BeginPopupex(). Removed _NoResize flag which is extraneous with AlwaysAutoResize.
|
2017-12-20 17:40:58 +01:00 |
|
omar
|
55c0d2b9ab
|
InputText: renamed ImGuiInputTextFlags_DisableUndo to ImGuiInputTextFlags_NoUndoRedo (#1506, #1508)
|
2017-12-20 16:25:03 +01:00 |
|
ibachar
|
abaf347deb
|
Added a flag for text input to disable undo / redo
|
2017-12-17 15:27:56 +02:00 |
|
omar
|
b1d90b565d
|
Columns: Fixed previous commit (wrong chunk commited) (#125)
|
2017-12-15 17:09:41 +01:00 |
|
omar
|
b9391d1692
|
Columns: Internal: Columns have their no set of flags so NoResize can be setup by internal code. (#125)
|
2017-12-15 17:06:47 +01:00 |
|
omar
|
6497f5dc1b
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.h
|
2017-12-15 11:59:50 +01:00 |
|
omar
|
0c6e260f73
|
Drag and Drop: Added ImGuiDragDropFlags_SourceExtern to facilitate interfacing with WM_DROPFILES (#143)
|
2017-12-15 11:17:21 +01:00 |
|
omar
|
6effcf21d6
|
Drag and Drop: Source can also inhibit the preview on target, useful for extern sources that only exists for one frame. (#143)
|
2017-12-15 11:17:21 +01:00 |
|
omar
|
51433e26af
|
Drag and Drop: Renamed to ImGuiDragDropFlags_SourceNoAutoTooltip to ImGuiDragDropFlags_SourceNoPreviewTooltip (#143)
|
2017-12-15 10:15:51 +01:00 |
|
omar
|
eefea0588a
|
Using the ImGuiWindowFlags_NoScrollWithMouse flag on a child window forwards the mouse wheel event to the parent window, unless either ImGuiWindowFlags_NoInputs or ImGuiWindowFlags_NoScrollbar are also set. (#1380, #1502)
|
2017-12-14 18:42:41 +01:00 |
|
Branimir Karadžić
|
ac8e708c3e
|
Fixed unused variable warning.
|
2017-12-14 18:14:43 +01:00 |
|
omar
|
45bca7851d
|
Added ImGuiHoveredFlags_RootAndChildWindows helper for consistency with focused flags. (#1382)
|
2017-12-13 22:30:16 +01:00 |
|
omar
|
cc3192f347
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_internal.h
|
2017-12-13 22:09:08 +01:00 |
|
omar
|
f265e16b84
|
Revert "Scrollbar: Minor simplication of the code using InnerRect data." > Introduced sheering on the scrollbar rectangle because InnerRect isn't setup at this point.
This reverts commit 7ac1583411 .
|
2017-12-13 22:07:18 +01:00 |
|
omar
|
ddbcda8c1b
|
Columns: Column width data is no longer lost while dragging toward the right side. (#1499, #125)
|
2017-12-13 21:51:23 +01:00 |
|
omar
|
ba71e1c0e4
|
Columns: Minor stylistic fixes. (#125)
|
2017-12-13 21:48:56 +01:00 |
|
omar
|
f7c5f420e7
|
BeginChild() fix using negative sizes as window position because of erroneous clamping. It was hard to notice until we added asserts for it. (#1500)
|
2017-12-13 19:45:03 +01:00 |
|
omar
|
e8e84a6ad6
|
Columns: Added internal tracking of a few flag temporarily, to facilitate the work of third-parties who have columns patches. (#125)
|
2017-12-13 19:26:04 +01:00 |
|
omar
|
4ae5c7e227
|
Columns: Refactor: Moved ColumnsSet[] to window out of DC as they are persistent data for most + fix for pre C++11 compilers. (#125, #1499)
|
2017-12-13 19:21:21 +01:00 |
|
omar
|
b016215c80
|
Columns: Refactor: Not using statestorage lookup anymore. (#125, #1499)
|
2017-12-13 19:07:09 +01:00 |
|
omar
|
3a31a75e3b
|
Columns: Refactor: Renamed all members. (#125, #1499)
|
2017-12-13 18:42:06 +01:00 |
|
omar
|
78320aa633
|
Columns: Refactor: Moved columns data into their own data structure. Minimum changes now to ease diffing. (#125, #1499)
|
2017-12-13 18:41:51 +01:00 |
|
omar
|
027ffd91ea
|
IsWindowFocused(): oops, that was bound to happen with loosely typed enums (this is sort of why I made both values identical - no direct side effects).
|
2017-12-12 23:49:04 +01:00 |
|
omar
|
16fb58984f
|
Merge branch 'master' into navigation
|
2017-12-12 23:41:48 +01:00 |
|
omar
|
90d0b8b58b
|
Navigation: minor sync to reduce drifts between changes
|
2017-12-12 23:41:20 +01:00 |
|
omar
|
8b59ed0708
|
Drag and Drop: Exposed some internals.
|
2017-12-12 23:37:27 +01:00 |
|
omar
|
7c7a7baf76
|
Merged miscellaneous small stuff (from nav/dock branches).
|
2017-12-12 23:36:25 +01:00 |
|
omar
|
b174fcc9af
|
Added IsAnyWindowFocused() (from Nav branch).
|
2017-12-12 23:35:04 +01:00 |
|
omar
|
fa9327ccf8
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
|
2017-12-12 20:44:12 +01:00 |
|
omar
|
d0a1be0de0
|
Merge branch 'drag_and_drop'
|
2017-12-12 20:39:52 +01:00 |
|
omar
|
ab049c6fc0
|
Drag and Drop: Fix merge for IMGUI_DISABLE_OBSOLETE_FUNCTIONS
|
2017-12-12 20:34:16 +01:00 |
|
omar
|
7faa5b16bb
|
Tweak
|
2017-12-12 19:15:00 +01:00 |
|