omar
|
a0c2e55e8c
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-01-02 23:11:52 +01:00 |
|
omar
|
237109caa5
|
Internals: Extracted code out of EndFrame() into UpdateMouseMovingWindowEndFrame()
|
2019-01-02 23:08:32 +01:00 |
|
omar
|
b3469fa94b
|
Alternative fix for bug introduced in d845135 (#1651), fix CTRL+Tab and fallback tooltip.
|
2019-01-02 23:08:32 +01:00 |
|
omar
|
3e30bfd6c9
|
Revert "Fixes crash/assert bug introduced in d845135 (#1651): would assert when showing the CTRL+Tab list and or fallback "...." tooltip."
This reverts commit 1b0e38df47.
|
2019-01-02 22:56:17 +01:00 |
|
omar
|
1b0e38df47
|
Fixes crash/assert bug introduced in d845135 (#1651): would assert when showing the CTRL+Tab list and or fallback "...." tooltip.
|
2019-01-02 22:14:28 +01:00 |
|
omar
|
0cabe4dedf
|
Viewport: Added ImGuiWindowClass / SetNextWindowClass() (concept imported from Docking ImGuiDockFamily), which currently allows to overwrite viewport flags on a per-window basis. Exposed FindViewportByID(). Win32: Support for ParentViewportId. (#1542)
|
2019-01-02 21:33:23 +01:00 |
|
omar
|
cfcad42b89
|
Viewport: Win32: Workaround to the fact that ::WindowFromPoint() seems to return Windows using ImGuiViewportFlags_NoInputs / HTTRANSPARENT when dragging nearby the platform title bar. This is to allow using platform decoration. I don't understand this well atm. (#1542)
|
2019-01-02 19:03:45 +01:00 |
|
omar
|
4a6f95acc8
|
Viewport: Added Platform_UpdateWindow hook for general purpose: Rework Win32 code to reflect viewport flags changes into Win32 while the window is active.
|
2019-01-02 19:03:36 +01:00 |
|
omar
|
5305c32242
|
Viewport: Reorder flags. Set owned viewport common decoration flags in Begin(). Moved code in UpdateViewportsEndFrame() before we introduce family/class based overrides.
|
2019-01-02 19:03:11 +01:00 |
|
omar
|
951c9dd68b
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
2019-01-02 19:00:31 +01:00 |
|
omar
|
d9a4cbc429
|
Examples: Comments about GLFW/SDL versions
|
2019-01-02 16:04:13 +01:00 |
|
omar
|
c017a4fb5f
|
Moved guidelines to issue #2261 to Pin and increase visibility for now.
|
2019-01-02 14:28:49 +01:00 |
|
omar
|
acacd93836
|
Renamed extra_flags to flags in InputXXX parameters.
|
2019-01-02 11:08:14 +01:00 |
|
omar
|
c738f9ef92
|
InputFloat: When using ImGuiInputTextFlags_ReadOnly the step buttons are disabled. (#2257)
|
2019-01-02 11:03:56 +01:00 |
|
omar
|
6b97ded438
|
Happy new year! & comments
|
2019-01-02 10:57:57 +01:00 |
|
omar
|
e21bc44684
|
Comments: fixed missing line in the "how a simple rendering function may look like" section (#2258)
|
2019-01-02 09:57:25 +01:00 |
|
omar
|
d845135273
|
Error recovery: Extraneous/undesired calls to End() are now being caught by an assert in the End() function itself at the call site (instead of being reported in EndFrame). Past the assert, they don't lead to crashes any more. Missing calls to End(), pass the assert, should not lead to crashes any more, nor to the fallback/debug window appearing on screen. (#1651).
|
2018-12-23 18:00:37 +01:00 |
|
omar
|
a9a60a24c1
|
Tweaked asserts
|
2018-12-23 17:51:50 +01:00 |
|
omar
|
a71d3c8cb3
|
Viewport: Misc comments following user feedbacks..
|
2018-12-21 18:40:16 +01:00 |
|
omar
|
2889a14f86
|
Build fix for master.
|
2018-12-21 16:45:24 +01:00 |
|
omar
|
9d0bc3f9ab
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
2018-12-21 16:43:12 +01:00 |
|
omar
|
b1cd52b674
|
Examples: SDL: Avoid testing for SDL_GetKeyboardFocus() on Android and iOS (like Emscripten). (#421)
|
2018-12-21 16:41:29 +01:00 |
|
omar
|
afe9c5c5f7
|
Examples: SDL: Fixed compilation for SDL 2..0.3 and less (running on our test servers) and clarified a bit of the messy situation. Followup to 8dd83c5. (#1542, #2117)
|
2018-12-21 16:26:17 +01:00 |
|
omar
|
ee5560a958
|
Merge branch 'master' into viewport + added style tweak block when viewports are enabled
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_win32_directx11/main.cpp
|
2018-12-20 23:04:40 +01:00 |
|
omar
|
d5b22fb635
|
Examples: Setting up style before bindings, so in complex binding (vulkan/dx12) it isn't miles away from the context creation.
|
2018-12-20 22:58:34 +01:00 |
|
omar
|
62cfdceac1
|
Examples: Viewport: Moved the "make current GL context" to reduce the amount of call and hopefully be more explicit about viewport enabled vs disabled requirements. (#1542)
|
2018-12-20 22:40:22 +01:00 |
|
omar
|
d9fda22763
|
Viewport: Fixed not clearing request flags in main viewport, which led some back-end (SDL) to break on resize as PlatformRequestResize would stay true forever and inhibit new sizes passed to AddUpdateViewport(). (#1542)
|
2018-12-20 22:33:51 +01:00 |
|
omar
|
8dd83c5fe8
|
Examples: SDL: SDL_GetMouseState() seems problematic, movements feels laggy in the non-viewport code path. (#1542, #2117)
|
2018-12-20 22:28:31 +01:00 |
|
omar
|
b471813f54
|
Made it illegal to call Begin("") with an empty string. This somehow accidentally worked before but had various undesirable side-effect as the window would have ID zero. In particular it is causing problems in viewport/docking branches.
|
2018-12-20 20:01:02 +01:00 |
|
omar
|
02501f07c3
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
2018-12-20 16:54:32 +01:00 |
|
omar
|
a0e5bb9532
|
Viewport: Corrected/clarified comments. Moved RenderPlatformWindowsDefault() next to UpdatePlatformWindow(). Removed unnecessary flag check.
|
2018-12-20 16:49:31 +01:00 |
|
omar
|
39dde66b21
|
IO: Realigned all fields, very minor comments change. This is nearly a no-op if you don't ignore Spaces.
|
2018-12-20 11:48:52 +01:00 |
|
omar
|
5691385a33
|
IO: Added BackendPlatformUserData, BackendRendererUserData, BackendLanguageUserData void* for storage use by back-ends. (#2004 + for cimgui)
|
2018-12-20 11:41:24 +01:00 |
|
omar
|
8399fb5071
|
Changed ImGuiCol_ChildBg to (0,0,0,0) in Dark style instead of (1,1,1,0), to match other styles. Shouldn't have any effect for the end-user.
|
2018-12-19 15:20:18 +01:00 |
|
omar
|
6890e08bc5
|
Fixed using SetNextWindowPos() on a child window (which wasn't really documented) position the cursor as expected in the parent window, so there is no mismatch between the layout in parent and the position of the child window. Demo tweak and adding some child window stuff
|
2018-12-19 15:19:31 +01:00 |
|
omar
|
89ac0ea7c1
|
Various user-facing comments
|
2018-12-19 11:19:55 +01:00 |
|
omar
|
84d1ce3958
|
Tidying up README, moved entries to FAQ, updated screenshots, removed comma in title.
|
2018-12-18 16:17:27 +01:00 |
|
omar
|
ca953f0fee
|
Fix merge issue on master.
|
2018-12-18 15:11:11 +01:00 |
|
omar
|
9c916cdaf9
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-12-18 15:02:35 +01:00 |
|
omar
|
ae76a1fda7
|
Window, Focus, Popup: Fixed an issue where closing a popup by clicking another window with the _NoMove flag would refocus the parent window of the popup instead of the newly clicked window.
|
2018-12-18 15:01:15 +01:00 |
|
omar
|
510ca373a2
|
Moved setting up NavHideHighlightOneFrame from lower-level ClosePopupToLevel() to CloseCurrentPopup() with an explanation. (Followup on 68d3e139a7)
|
2018-12-18 14:59:22 +01:00 |
|
omar
|
1a6ec208cc
|
Docs: various updates, rewording, clarifying the purpose of a PR.
|
2018-12-18 12:02:55 +01:00 |
|
omar
|
65dac02171
|
Internals: Popups: Renamed CurrentPopupStack to BeginPopupStack which is much less ambiguous.
|
2018-12-14 18:44:17 +01:00 |
|
omar
|
f6f5c51106
|
Internals: Popups: EndMenu() calls ClosePopupToLevel(g.CurrentPopupStack.Size) which is more correct.
|
2018-12-14 18:42:28 +01:00 |
|
omar
|
f1c7596409
|
Internals: Popup related comments. Renamed the misleading internal ClosePopup() function. Added bool* test to BeginPopupModal in demo.
|
2018-12-14 18:42:22 +01:00 |
|
omar
|
5d20da1b36
|
Viewport, DPI: Now using DpiScale from the ImGuiPlatformMonitor array instead of calling Platform_GetWindowDpiScale() before the platform window creation. Might even tentatively see if things work out without Platform_GetWindowDpiScale. (#1676)
|
2018-12-14 12:12:26 +01:00 |
|
omar
|
587506dd57
|
Tests: Changed prototype of ImGuiTestEngineHook_ItemAdd to match functions called in same spot. Made ButtonBehavior submit fallback item info if ItemAdd() was not called (for resize grips, resize borders, scrollbar, columns, etc.)
|
2018-12-14 11:27:02 +01:00 |
|
omar
|
2a1e903f43
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.h
|
2018-12-13 19:20:34 +01:00 |
|
omar
|
8497948ba0
|
Comments, minor tweaks.
|
2018-12-13 19:17:36 +01:00 |
|
omar
|
e50894c95e
|
Metrics: Fixed crash when viewports are disabled (g.MouseLastHoveredViewport is never set).
|
2018-12-13 19:16:44 +01:00 |
|