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
|
061d8df033
|
MIssing IMGUI_API for a type with non-inline methods.
|
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 |
|
omar
|
8b432cf590
|
Merge pull request #1551 from Crunkle/master
Fix incorrect header name on Linux MinGW systems.
|
2018-01-14 11:26:03 +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
|
16285603f2
|
Internals: Initializing fields in same order as declaration order + fixed uninitialized DragDropAcceptIdCurrRectSurface (was harmless)
|
2018-01-12 19:11:11 +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
|
a8bbb0b7dd
|
Demo: Using IM_COL32() instead of ImColor() in ImDrawList centric contexts.
|
2018-01-11 15:47:07 +01:00 |
|
omar
|
12aa3cb09e
|
Demo: Tweaks format.
|
2018-01-11 15:22:33 +01:00 |
|
omar
|
398a4e1865
|
Made obsolete IsAnyWindowHovered()/IsAnyWindowFocused() static inline. static only tends to trigger warnings. (#1382)
|
2018-01-11 13:58:25 +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
|
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 |
|