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
|
a7deb3a394
|
Demo: Minor tweaks.
|
2018-01-03 15:36:51 +01:00 |
|
omar
|
9fbecac87e
|
Demo: Improved Selectable() examples. (#1528)
|
2018-01-03 15:11:14 +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
|
79d38e5ade
|
Updated copyright date for 2018
|
2018-01-03 14:32:16 +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 |
|
Branimir Karadžić
|
856ee17ed8
|
Fixed Android clang warning.
|
2018-01-03 10:29:37 +01:00 |
|
omar
|
7e03ee8d85
|
Merge branch 'master' into navigation
|
2018-01-02 17:21:49 +01:00 |
|
omar
|
bfc9c5216a
|
Merge pull request #1529 from unprompted/master
Fix a memory leak of ImGuiColumnsSet's Columns vector. ImVector doesn't call destructors.
|
2018-01-02 17:21:17 +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
|
4af84ac781
|
ImFontAtlas: Handle stb_truetype failure more gracefully, GetTexDataAsRGBA32() won't crash during conversion. (#1527)
|
2017-12-30 23:10:11 +01:00 |
|
omar
|
7a15fc8de5
|
Merge branch 'master' into navigation
|
2017-12-29 18:28:23 +01:00 |
|
omar
|
6ec00a366a
|
Internals: ImRect: Minor formatting tweaks.
|
2017-12-29 18:28:04 +01:00 |
|
omar
|
fbf2435f38
|
Exposed IM_OFFSETOF() helper in imgui.h
|
2017-12-29 18:16:19 +01:00 |
|
omar
|
eef9120e07
|
Reorganized comments in the IMGUI_DISABLE_OBSOLETE_FUNCTIONS function. Added an IM_ASSERT(0).
|
2017-12-29 18:14:36 +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
|
9f8632b131
|
Examples: Comments about invalid mouse pos.
|
2017-12-29 15:03:36 +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
|
6e30c33642
|
Demo dinaries update
|
2017-12-26 21:04:17 +01:00 |
|
omar
|
7fd805497a
|
Update README.md
|
2017-12-26 20:30:22 +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 |
|
Branimir Karadžić
|
149523a101
|
Fixing error: declaration of ‘size’ shadows a member of 'this' [-Werror=shadow]
|
2017-12-25 22:27:32 +01:00 |
|
omar
|
9511f22e8b
|
Demo: Console: More friendly to text color changes.
|
2017-12-25 18:47:44 +01:00 |
|
omar
|
e916310b2e
|
Version 1.53
|
2017-12-25 17:41:41 +01:00 |
|
omar
|
3d48f5b8c2
|
Demo: BeginCombo() demo code
|
2017-12-25 17:41:02 +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
|
78f48bb795
|
Examples: DirectX10,DirectX11: Moved call to OMSetRenderTargets() in main loop so example code can integrate more nicely with other code.
|
2017-12-25 14:54:54 +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 |
|