omar
|
7ad169fa09
|
Merge branch 'master' into navigation + fix previous merge
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
d730a763f6
|
Internal: Reworked FocusFrontMostActiveWindow() so it fits the Nav branch usage as well.
|
7 years ago |
|
omar
|
66b2ee6ea2
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
a34490239c
|
Internals: Popup: Separating MousePosOnOpen and PopupPosOnOpen. They are equal in the master branch but different in the navigation branch.
|
7 years ago |
|
omar
|
5fd19f037f
|
Internals: renamed FocusPreviousWindow() to FocusfrontMostActiveWindow()
|
7 years ago |
|
omar
|
2874aabb93
|
Internals: BringWindowToFront() iterate front to back, faster in majority of use cases.
|
7 years ago |
|
omar
|
3d24a9eb40
|
Examples: DirectX9/10/11: Comments about CS_DBLCLKS + formatting tweaks. (#1538)
|
7 years ago |
omar
|
65dd55cb2b
|
Merge pull request #1538 from ndandoulakis/ndandoulakis-CS_DBLCLKS-patch
Examples: DirectX9,10,10: Support for CS_DBLCLKS by treating double-click down messages are regular down. (#1538, #754)
|
7 years ago |
|
omar
|
407955d9fb
|
Examples: Using IM_OFFSETOF macro. + Comments
|
7 years ago |
Nick Dandoulakis
|
bfc25bc8a3
|
CS_DBLCLKS support for DirectX 11
|
7 years ago |
|
Nick Dandoulakis
|
583e97b297
|
CS_DBLCLKS support for DirectX 10
|
7 years ago |
|
Nick Dandoulakis
|
20ae6439ea
|
CS_DBLCLKS support for Directx9
|
7 years ago |
|
omar
|
95b773370f
|
Revert "Internals: Added LastActiveId, LastActiveIdTimer. (#1537)" Will come up with a better design later.
This reverts commit 007f4034c9.
|
7 years ago |
|
omar
|
007f4034c9
|
Internals: Added LastActiveId, LastActiveIdTimer. (#1537)
|
7 years ago |
|
omar
|
4c90529c62
|
Examples: Visual Studio projects: Disabled extraneous function-level check in Release build.
|
7 years ago |
|
omar
|
ecbfdd3143
|
Added extraneous initialization to NULL. (#1527).
|
7 years ago |
|
omar
|
29c194b2a4
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
4fc9f44073
|
Merge of minor left-overs from private work branch to reduce drifts. Should be functionally a no-op.
|
7 years ago |
|
omar
|
4b1240b2e1
|
Fixed non-popup child windows not honoring the HiddenFrames flag (can't see a reason). Docking relies on this.
|
7 years ago |
|
omar
|
b2ec0741f1
|
Internals: Settings api tweaks
|
7 years ago |
|
omar
|
2b8224692e
|
Merge branch 'master' into navigation
|
7 years ago |
|
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.
|
7 years ago |
|
omar
|
a7deb3a394
|
Demo: Minor tweaks.
|
7 years ago |
|
omar
|
9fbecac87e
|
Demo: Improved Selectable() examples. (#1528)
|
7 years ago |
|
omar
|
33f7769d85
|
Columns: Clear offsets data when columns count changed. (#1525)
|
7 years ago |
|
omar
|
f9b2058d5a
|
Internals: Renamed ImGuiSimpleColumns to ImGuiMenuColumns to avoid confusion. Reduced internal buffer size (we only use 3 slots).
|
7 years ago |
|
omar
|
79d38e5ade
|
Updated copyright date for 2018
|
7 years ago |
|
omar
|
05ec0b0736
|
Casing tweaks + clarify license copyright (simpler/safer?) (#1346)
|
7 years ago |
|
omar
|
96ccc484f9
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_internal.h
|
7 years ago |
|
omar
|
3c6fbe0849
|
Renamed ImGuiSizeConstraintCallback to ImGuiSizeCallback, ImGuiSizeConstraintCallbackData to ImGuiSizeCallbackData.
|
7 years ago |
|
omar
|
7fcbd45500
|
Internals: NextWindow: Renamed, moved functions to member.
|
7 years ago |
|
omar
|
e339949de1
|
Internals: NextWindow: Using ImGuiCond for consistency.
|
7 years ago |
|
omar
|
04b44398eb
|
Internals: refactored g.SetNextWindow fields into g.NextWindow. structure (so it can be more easily transported/copied)
|
7 years ago |
Branimir Karadžić
|
856ee17ed8
|
Fixed Android clang warning.
|
7 years ago |
|
omar
|
7e03ee8d85
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
bfc9c5216a
|
Merge pull request #1529 from unprompted/master
Fix a memory leak of ImGuiColumnsSet's Columns vector. ImVector doesn't call destructors.
|
7 years ago |
Cory McWilliams
|
561e9f286e
|
Fix a memory leak of ImGuiColumnsSet's Columns vector. ImVector doesn't call destructors.
|
7 years ago |
|
omar
|
170bcb2d7c
|
Internals: NewFrame: Shuffled some code around (to minimize upcoming patches)
|
7 years ago |
|
omar
|
4af84ac781
|
ImFontAtlas: Handle stb_truetype failure more gracefully, GetTexDataAsRGBA32() won't crash during conversion. (#1527)
|
7 years ago |
|
omar
|
7a15fc8de5
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
6ec00a366a
|
Internals: ImRect: Minor formatting tweaks.
|
7 years ago |
|
omar
|
fbf2435f38
|
Exposed IM_OFFSETOF() helper in imgui.h
|
7 years ago |
|
omar
|
eef9120e07
|
Reorganized comments in the IMGUI_DISABLE_OBSOLETE_FUNCTIONS function. Added an IM_ASSERT(0).
|
7 years ago |
|
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.
|
7 years ago |
|
omar
|
9f8632b131
|
Examples: Comments about invalid mouse pos.
|
7 years ago |
|
omar
|
c4e6d622c1
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
|
7 years ago |
|
omar
|
4fbdb50dca
|
MenuBar: Fixed menu bar pushing a clipping rect outside of its allocated bound (usually unnoticeable).
|
7 years ago |
|
omar
|
4ba2e85744
|
Demo: Tweak. Comments. Metrics: Added some Drag and Drop info.
|
7 years ago |
|
omar
|
90ff4ae5d1
|
BeginPopupModal(): the conditional test for SetNextWindowPos() was polling the wrong window, which in practice made the test succeed all the time.
|
7 years ago |
|
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)
|
7 years ago |