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)
|
7 years ago |
|
omar
|
c9be7d7254
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
7 years ago |
|
omar
|
0a98202714
|
Nav: Standardized FIXME-NAV marker.
|
7 years ago |
|
omar
|
16285603f2
|
Internals: Initializing fields in same order as declaration order + fixed uninitialized DragDropAcceptIdCurrRectSurface (was harmless)
|
7 years ago |
|
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)
|
7 years ago |
|
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)
|
7 years ago |
|
omar
|
f7b10fc954
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
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)
|
7 years ago |
|
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.
|
7 years ago |
|
omar
|
1c95dea88c
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
7d2a068dea
|
Begin: Shuffling bits of code around.
|
7 years ago |
|
omar
|
cd7e178eac
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
651538e13b
|
Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337)
|
7 years ago |
|
omar
|
a8bbb0b7dd
|
Demo: Using IM_COL32() instead of ImColor() in ImDrawList centric contexts.
|
7 years ago |
|
omar
|
12aa3cb09e
|
Demo: Tweaks format.
|
7 years ago |
|
omar
|
398a4e1865
|
Made obsolete IsAnyWindowHovered()/IsAnyWindowFocused() static inline. static only tends to trigger warnings. (#1382)
|
7 years ago |
|
omar
|
a63fbbca8b
|
Added ImGuiHoveredFlags_AnyWindow, ImGuiFocusedFlags_AnyWindow. Obsoleted IsAnyWindowHovered()/IsAnyWindowFocused() in favor of IsWindowHovered(ImGuiHoveredFlags_AnyWindow)/IsWindowFocused(ImGuiFocusedFlags_AnyWindow). Added to demo. (#1382)
|
7 years ago |
|
omar
|
67671c0ab5
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
1eee10778b
|
Internals: Begin: Refactor some code into an UpdateManualResize() function.
|
7 years ago |
|
omar
|
483f9b0d07
|
Internals: Begin: Moved DrawList setup code below, the viewport system will need to push the outer clipping rectangle as late as possible.
|
7 years ago |
|
omar
|
03f5cd6ca1
|
Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7. (#787)
|
7 years ago |
|
omar
|
919fc548ad
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
6c583315e6
|
Begin: Moving some code around for the benefits of the wip viewport branch.
|
7 years ago |
|
omar
|
f610e25682
|
Internals: Using ImFloor().when appropriate.
|
7 years ago |
|
omar
|
0cabd81071
|
Internals: Rect: Added ClipWillFull helper + comments on variations.
|
7 years ago |
|
omar
|
92d75c44bc
|
Internals: ImVec2 versions of ImMin, ImMax inline float version for a faster full-on-debug-no-inline experience.
|
7 years ago |
|
omar
|
fe919995da
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
933ee6cd5d
|
InputText: Added alternative clipboard shortcuts: Shift+Delete (cut), Ctrl+Insert (copy), Shift+Insert (paste). (#1541)
|
7 years ago |
|
omar
|
fd4d63a0c5
|
InputText: Moved code for checking clipboard shortcut so we can expand on it. (#1541)
|
7 years ago |
|
omar
|
ce95b84825
|
Added ImGuiKey_Insert for future use. Setup in all example bindings. (#1541)
|
7 years ago |
|
omar
|
39cb56c39e
|
Examples: OpenGL3+GLFW: Using 3.2 context + GLSL version 150 (#1466)
|
7 years ago |
|
omar
|
7484c63449
|
Examples: OpenGL3+SDL: Changed GLSL shader version to 150 (#1466, #1504)
|
7 years ago |
|
omar
|
168200f915
|
Popups: Comments, reorganize bits of the header section, renamed parameters.
|
7 years ago |
|
omar
|
a8e5542d78
|
BeginPopup: Exposed extra_flags publicly. (#1533)
|
7 years ago |
|
omar
|
3f4eccf154
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
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)
|
7 years ago |
|
omar
|
deab2ab015
|
Popups: Gently handle the user mistakenly calling OpenPopup() every frame. (when reopen_existing is true). (#1497)
|
7 years ago |
|
omar
|
69ff65f054
|
Internals: Popup: Renaming fields.
|
7 years ago |
|
omar
|
3678307cd9
|
Popup, Menus: Tweaks and comments.
|
7 years ago |
|
omar
|
369189b675
|
Internals: Popup: Explicitely setting up ImGuiPopupRef reduces confusion.
|
7 years ago |
|
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)
|
7 years ago |
|
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)
|
7 years ago |
|
omar
|
c337cdcfd3
|
Internal: ButtonBehavior: Tweak to update g.ActiveIdClickOffset more consistently
|
7 years ago |
|
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 |