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
|
81a2546cea
|
Merge branch 'viewport' into docking
# Conflicts:
# examples/example_allegro5/main.cpp
# examples/example_win32_directx9/main.cpp
|
2018-12-20 23:06:29 +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
|
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)
|
2018-12-20 19:20:26 +01:00 |
|
omar
|
e043b89814
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.h
|
2018-12-20 17:03:21 +01:00 |
|
omar
|
8fc19d2194
|
Removed IMGUI_HAS_TABS from Docking branch, it's not defined anywhere anymore.
|
2018-12-20 16:56:48 +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
|
088ef6623a
|
Merge branch 'viewport' into docking
|
2018-12-18 15:03:01 +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
|
ac9512e095
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2018-12-14 18:46:24 +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
|
9b09c7597f
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui_demo.cpp
|
2018-12-13 19:21:51 +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 |
|
omar
|
991b16cc6a
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_widgets.cpp
|
2018-12-11 19:46:46 +01:00 |
|
omar
|
1b263f6ab0
|
Tabs: Fixed support for drag and drop ImGuiButtonFlags_PressedOnDragDropHold. (#261) incorrectly missing from the merge from Docking branch.
|
2018-12-11 19:37:22 +01:00 |
|
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)
|
2018-12-11 19:19:12 +01:00 |
|
omar
|
d9a84de9d9
|
Contents size is preserved while a window collapsed. Fix auto-resizing window losing their size for one frame when uncollapsed.
|
2018-12-11 19:08:06 +01:00 |
|
omar
|
ccce47c6a2
|
Demo: Using Tabs in Style Editor and Simple Layout example. + Adding missing early out in About and Documents examples.
|
2018-12-11 18:10:43 +01:00 |
|
omar
|
5a6b8e00db
|
BeginTabBar: Fix to push the expected ID into the ID stack (instead of a hash's hash). (#261)
|
2018-12-11 15:22:10 +01:00 |
|
omar
|
2886e0b6f5
|
Demo: Fix collateral damage of 54a60aa
|
2018-12-11 13:25:29 +01:00 |
|
omar
|
95dcc534ed
|
Demo: Fix collateral damage of 54a60aa
|
2018-12-11 13:25:16 +01:00 |
|
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
|
2018-12-11 13:23:00 +01:00 |
|
omar
|
c40feabe4d
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-12-11 12:41:40 +01:00 |
|
omar
|
54a60aaa40
|
Added BETA api for Tab Bar/Tabs widgets. (#261, #351) (merged this feature from the from Docking branch so it can be used earlier as as standalone feature)
- Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem(), SetTabItemClosed() API.
- Added ImGuiTabBarFlags flags for BeginTabBar().
- Added ImGuiTabItemFlags flags for BeginTabItem().
- Style: Added ImGuiCol_Tab, ImGuiCol_TabHovered, ImGuiCol_TabActive, ImGuiCol_TabUnfocused, ImGuiCol_TabUnfocusedActive colors.
- Demo: Added Layout->Tabs demo code.
- Demo: Added "Documents" example app showcasing possible use for tabs.
|
2018-12-11 12:36:47 +01:00 |
|
omar
|
cc1283fb78
|
Added ImGuiWindowFlags_UnsavedDocument window flag to append '*' to title without altering the ID, as a convenience to avoid using the ### operator. (merged from Docking branch)
|
2018-12-11 12:20:48 +01:00 |
|