omar
|
238321c159
|
Fix merge in Docking branch, remove ConfigDockingWithShift flag from DX11 example + misnamed function.
|
6 years ago |
|
omar
|
e181b0c3fc
|
Merge branch 'viewport' into docking
|
6 years ago |
|
omar
|
2889a14f86
|
Build fix for master.
|
6 years ago |
|
omar
|
9d0bc3f9ab
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
6 years ago |
|
omar
|
b1cd52b674
|
Examples: SDL: Avoid testing for SDL_GetKeyboardFocus() on Android and iOS (like Emscripten). (#421)
|
6 years ago |
|
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)
|
6 years ago |
|
omar
|
81a2546cea
|
Merge branch 'viewport' into docking
# Conflicts:
# examples/example_allegro5/main.cpp
# examples/example_win32_directx9/main.cpp
|
6 years ago |
|
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
|
6 years ago |
|
omar
|
d5b22fb635
|
Examples: Setting up style before bindings, so in complex binding (vulkan/dx12) it isn't miles away from the context creation.
|
6 years ago |
|
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)
|
6 years ago |
|
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)
|
6 years ago |
|
omar
|
8dd83c5fe8
|
Examples: SDL: SDL_GetMouseState() seems problematic, movements feels laggy in the non-viewport code path. (#1542, #2117)
|
6 years ago |
|
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.
|
6 years ago |
|
omar
|
5794c0491a
|
Docking: Fix an edge case failing to dock into an explicit dockspace which only have inactive nodes (because all the windows are inactive). (#2246, #2109)
|
6 years ago |
|
omar
|
e043b89814
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.h
|
6 years ago |
|
omar
|
8fc19d2194
|
Removed IMGUI_HAS_TABS from Docking branch, it's not defined anywhere anymore.
|
6 years ago |
|
omar
|
02501f07c3
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
a0e5bb9532
|
Viewport: Corrected/clarified comments. Moved RenderPlatformWindowsDefault() next to UpdatePlatformWindow(). Removed unnecessary flag check.
|
6 years ago |
|
omar
|
39dde66b21
|
IO: Realigned all fields, very minor comments change. This is nearly a no-op if you don't ignore Spaces.
|
6 years ago |
|
omar
|
5691385a33
|
IO: Added BackendPlatformUserData, BackendRendererUserData, BackendLanguageUserData void* for storage use by back-ends. (#2004 + for cimgui)
|
6 years ago |
|
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.
|
6 years ago |
|
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
|
6 years ago |
|
omar
|
89ac0ea7c1
|
Various user-facing comments
|
6 years ago |
|
omar
|
84d1ce3958
|
Tidying up README, moved entries to FAQ, updated screenshots, removed comma in title.
|
6 years ago |
|
omar
|
ca953f0fee
|
Fix merge issue on master.
|
6 years ago |
|
omar
|
088ef6623a
|
Merge branch 'viewport' into docking
|
6 years ago |
|
omar
|
9c916cdaf9
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
|
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.
|
6 years ago |
|
omar
|
510ca373a2
|
Moved setting up NavHideHighlightOneFrame from lower-level ClosePopupToLevel() to CloseCurrentPopup() with an explanation. (Followup on 68d3e139a7)
|
6 years ago |
|
omar
|
1a6ec208cc
|
Docs: various updates, rewording, clarifying the purpose of a PR.
|
6 years ago |
|
omar
|
ac9512e095
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
65dac02171
|
Internals: Popups: Renamed CurrentPopupStack to BeginPopupStack which is much less ambiguous.
|
6 years ago |
|
omar
|
f6f5c51106
|
Internals: Popups: EndMenu() calls ClosePopupToLevel(g.CurrentPopupStack.Size) which is more correct.
|
6 years ago |
|
omar
|
f1c7596409
|
Internals: Popup related comments. Renamed the misleading internal ClosePopup() function. Added bool* test to BeginPopupModal in demo.
|
6 years ago |
|
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)
|
6 years ago |
|
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.)
|
6 years ago |
|
omar
|
9b09c7597f
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui_demo.cpp
|
6 years ago |
|
omar
|
2a1e903f43
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.h
|
6 years ago |
|
omar
|
8497948ba0
|
Comments, minor tweaks.
|
6 years ago |
|
omar
|
e50894c95e
|
Metrics: Fixed crash when viewports are disabled (g.MouseLastHoveredViewport is never set).
|
6 years ago |
|
omar
|
991b16cc6a
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_widgets.cpp
|
6 years ago |
|
omar
|
1b263f6ab0
|
Tabs: Fixed support for drag and drop ImGuiButtonFlags_PressedOnDragDropHold. (#261) incorrectly missing from the merge from Docking branch.
|
6 years ago |
|
omar
|
febc3e6aa1
|
Internals: Windows hidden with HiddenFramesRegular (but NOT HiddenFramesForResize) preserve their SizeContents, so restoring a auto-resize window after it's been hidden by tabs won't reset its size for a frame. Arguable. Let's see how it goes. (Followup to b48e295bddbf965d7382ec5578ed05d2fe601114)
|
6 years ago |
|
omar
|
d9a84de9d9
|
Contents size is preserved while a window collapsed. Fix auto-resizing window losing their size for one frame when uncollapsed.
|
6 years ago |
|
omar
|
ccce47c6a2
|
Demo: Using Tabs in Style Editor and Simple Layout example. + Adding missing early out in About and Documents examples.
|
6 years ago |
|
omar
|
5a6b8e00db
|
BeginTabBar: Fix to push the expected ID into the ID stack (instead of a hash's hash). (#261)
|
6 years ago |
|
omar
|
2886e0b6f5
|
Demo: Fix collateral damage of 54a60aa
|
6 years ago |
|
omar
|
95dcc534ed
|
Demo: Fix collateral damage of 54a60aa
|
6 years ago |
|
omar
|
067b691fd8
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/TODO.txt
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_draw.cpp
# imgui_internal.h
# imgui_widgets.cpp
|
6 years ago |
|
omar
|
c40feabe4d
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
6 years ago |