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
|
0cabd81071
|
Internals: Rect: Added ClipWillFull helper + comments on variations.
|
2018-01-10 14:43:08 +01:00 |
|
omar
|
92d75c44bc
|
Internals: ImVec2 versions of ImMin, ImMax inline float version for a faster full-on-debug-no-inline experience.
|
2018-01-10 14:43:02 +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
|
ce95b84825
|
Added ImGuiKey_Insert for future use. Setup in all example bindings. (#1541)
|
2018-01-08 15:30:39 +01:00 |
|
omar
|
39cb56c39e
|
Examples: OpenGL3+GLFW: Using 3.2 context + GLSL version 150 (#1466)
|
2018-01-07 19:09:34 +01:00 |
|
omar
|
7484c63449
|
Examples: OpenGL3+SDL: Changed GLSL shader version to 150 (#1466, #1504)
|
2018-01-07 19:09:33 +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
|
3d24a9eb40
|
Examples: DirectX9/10/11: Comments about CS_DBLCLKS + formatting tweaks. (#1538)
|
2018-01-05 22:32:27 +01:00 |
|
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)
|
2018-01-05 22:27:40 +01:00 |
|
omar
|
407955d9fb
|
Examples: Using IM_OFFSETOF macro. + Comments
|
2018-01-05 22:05:02 +01:00 |
|
Nick Dandoulakis
|
bfc25bc8a3
|
CS_DBLCLKS support for DirectX 11
|
2018-01-05 22:28:27 +02:00 |
|
Nick Dandoulakis
|
583e97b297
|
CS_DBLCLKS support for DirectX 10
|
2018-01-05 22:25:30 +02:00 |
|
Nick Dandoulakis
|
20ae6439ea
|
CS_DBLCLKS support for Directx9
|
2018-01-05 22:16:35 +02: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
|
4c90529c62
|
Examples: Visual Studio projects: Disabled extraneous function-level check in Release build.
|
2018-01-04 11:42:05 +01:00 |
|
omar
|
ecbfdd3143
|
Added extraneous initialization to NULL. (#1527).
|
2018-01-04 11:06:12 +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
|
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 |
|