Commit Graph

  • 9b09c7597f Merge branch 'viewport' into docking omar 2018-12-13 19:21:51 +01:00
  • 2a1e903f43 Merge branch 'master' into viewport omar 2018-12-13 19:20:34 +01:00
  • 8497948ba0 Comments, minor tweaks. omar 2018-12-13 13:22:10 +01:00
  • e50894c95e Metrics: Fixed crash when viewports are disabled (g.MouseLastHoveredViewport is never set). omar 2018-12-13 19:16:34 +01:00
  • 991b16cc6a Merge branch 'master' into docking omar 2018-12-11 19:46:46 +01:00
  • 1b263f6ab0 Tabs: Fixed support for drag and drop ImGuiButtonFlags_PressedOnDragDropHold. (#261) incorrectly missing from the merge from Docking branch. omar 2018-12-11 19:37:22 +01:00
  • 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) omar 2018-07-02 22:53:59 +02:00
  • d9a84de9d9 Contents size is preserved while a window collapsed. Fix auto-resizing window losing their size for one frame when uncollapsed. omar 2018-12-11 19:08:06 +01:00
  • ccce47c6a2 Demo: Using Tabs in Style Editor and Simple Layout example. + Adding missing early out in About and Documents examples. omar 2018-12-11 16:59:17 +01:00
  • 5a6b8e00db BeginTabBar: Fix to push the expected ID into the ID stack (instead of a hash's hash). (#261) omar 2018-12-11 15:22:10 +01:00
  • 2886e0b6f5 Demo: Fix collateral damage of 54a60aa omar 2018-12-11 13:25:16 +01:00
  • 95dcc534ed Demo: Fix collateral damage of 54a60aa omar 2018-12-11 13:25:16 +01:00
  • 067b691fd8 Merge branch 'viewport' into docking omar 2018-12-11 13:23:00 +01:00
  • c40feabe4d Merge branch 'master' into viewport omar 2018-12-11 12:41:40 +01:00
  • 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. omar 2018-12-11 12:36:47 +01:00
  • 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) omar 2018-12-11 12:20:48 +01:00
  • 15447f5b7b Using named flags instead of 0 + shallow formatting tweaks from other branches. omar 2018-12-11 11:58:15 +01:00
  • 2d4018aa89 Docking: Fix io.ConfigWindowsMoveFromTitleBarOnly for docking branch. omar 2018-12-11 11:03:28 +01:00
  • e6439e1a16 Merge branch 'viewport' into docking + moved io.ConfigFlags ImGuiConfigFlags_DockingNoSplit to io.ConfigDockingNoSplit omar 2018-12-10 16:21:49 +01:00
  • 26b9e2d0a5 Merge branch 'master' into viewport omar 2018-12-10 16:14:31 +01:00
  • 9476e07d5a Added io.ConfigWindowsMoveFromTitleBarOnly option. Still is ignored by window with no title bars (often popups). This affects clamping window within the visible area: with this option enabled title bars need to be visible. (#899) Tweaked default value of style.DisplayWindowPadding from (20,20) to (19,19) so the default style as a value which is the same as the title bar height. omar 2018-12-10 16:05:30 +01:00
  • 59f3c4fc20 Renamed io.ConfigResizeWindowsFromEdges to io.ConfigWindowsResizeFromEdges and removed its [Beta] mark. Resizing windows from edge is now enabled by default (io.ConfigWindowsResizeFromEdges=true). Note that it only works _if_ the back-end sets ImGuiBackendFlags_HasMouseCursors, which the standard back-end do. omar 2018-12-10 15:36:07 +01:00
  • d20e3ee710 Tests: Adding imgui-test engine hooks (experimental) to provide missing widget state to the testing system. omar 2018-12-06 18:18:54 +01:00
  • 3a5e758ee3 Tabs: Fixed crash when using TabItem in a regular (non-docking) tab bar. (#2231) omar 2018-12-08 12:35:15 +01:00
  • f768727284 Merge branch 'viewport' into docking omar 2018-12-06 16:36:17 +01:00
  • a03846bd9e Merge branch 'master' into viewport omar 2018-12-06 16:33:39 +01:00
  • f3a0b17bb8 Viewport: Win32, GLFW, SDL: Clarified back-ends by using global mouse position direction. GLFW: disabled io.MouseHoveredViewport setting under Mac/Linux. (#1542, #2117) + various comments. omar 2018-12-06 16:30:10 +01:00
  • ac52d9d44c Viewport: Fix handling of PlatformRequestResize/PlatformRequestPos. when OS decoration are enabled via ImGuiConfigFlags_ViewportsDecoration . omar 2018-12-05 23:38:37 +01:00
  • e2082a675c Viewport: Fix handling of PlatformRequestResize/PlatformRequestPos. when OS decoration are enabled via ImGuiConfigFlags_ViewportsDecoration . omar 2018-12-05 23:38:37 +01:00
  • b94f0241f1 Docking: Adjusting the docking popup menu position so it tends to stay within the same viewport. omar 2018-12-05 21:19:42 +01:00
  • b96b1f2412 Docking: Documenting an issue. Renamed member of ImGuiDockFamily. omar 2018-12-04 16:38:27 +01:00
  • 125e62491e Internals: Nav: Added ImGuiNavLayer_ to clarify semantic of previously integer NavLayer values, and not pretend that increment/decrement operators on them super flexible. + Storage tweaks. omar 2018-12-04 14:30:11 +01:00
  • b58bd5b311 Version 1.67 WIP + todo notes omar 2018-12-04 13:49:29 +01:00
  • 6644f1ff64 Docking: Added io.ConfigDockingTabBarOnSingleWindows option (mostly made possible by the previous fixes). Note that dock node have regressions compared to current floating window: no collapse, no auto-resize, resize grip under the scrollbar, border issues, general overhead. Will tackle those. omar 2018-12-04 13:36:36 +01:00
  • 8cac70d8af Docking: Focus fix (missing line in 8bac6d4) omar 2018-12-04 13:34:16 +01:00
  • 5105c6c0d0 Merge branch 'viewport' into docking omar 2018-12-04 00:06:26 +01:00
  • 3a678d48b1 Merge branch 'master' into viewport omar 2018-12-04 00:02:11 +01:00
  • 8bac6d428d Docking: Another attempt at tidying the inconsistent focus / tab bar reordering issues, and toward generalizing single window dock nodes. (#2109) omar 2018-12-03 23:52:48 +01:00
  • 2da200fc16 Docking: Fix generalizing the transition from loose windows to dock node so we can switch to single window dock node while transferring viewports (vs creating two viewports and dropping one). + Extracted DockContextGenNodeID out of DockContextAddNode(). omar 2018-12-03 22:53:10 +01:00
  • fb6ef8b1db Comments, tweak omar 2018-12-03 18:17:50 +01:00
  • f6b6ad1959 Viewport: Minor tweaks, better struct layout. omar 2018-12-03 20:28:32 +01:00
  • 3e84f7cd1d Viewport: Fixed a viewport bug which led some popups to merge in underlying host viewport when they should be z-over their parent viewport. omar 2018-12-03 18:16:35 +01:00
  • eb311abc92 Fixed IMGUI_API tag on ImFontAtlas::IsBuilt() preventing to build as DLL on some setups. (#2226) omar 2018-12-03 17:49:38 +01:00
  • 8d58055a54 Examples: DirectX10/11/12: Made imgui_impl_dx10/dx11/dx12.cpp link d3dcompiler.lib from the .cpp file to ease integration. omar 2018-12-03 17:47:10 +01:00
  • 10e13dd6bb Version 1.67 WIP (again, this time IMGUI_VERSION_NUM has leeway for another hot-fix). omar 2018-12-03 12:19:23 +01:00
  • ac10889bde Merge branch 'viewport' into docking omar 2018-12-03 11:44:51 +01:00
  • 89a530b442 Somehow VS keeps modifying this GUID so I am going to playing along with it. omar 2018-12-03 11:44:08 +01:00
  • 65e579e558 Merge branch 'master' into viewport omar 2018-12-03 11:41:53 +01:00
  • 801645d350 Version 1.66b (will revisit how to change IMGUI_VERSION_NUM across versions, this commit reduces the numerical IMGUI_VERSION_NUM compared to the commit on Nov 22). v1.66b omar 2018-11-30 23:55:33 +01:00
  • 34e18ef771 Fixed a text rendering/clipping bug introduced in 1.66 (on 2018-10-12, commit ede3a3b9) that affect single ImDrawList::AddText() calls with single strings larger than 10k. Text/TextUnformatted() calls were not affected, but e.g. InputText() was. omar 2018-11-30 23:47:23 +01:00
  • 8289e5f6b4 Fixed a text rendering/clipping bug introduced in 1.66 (on 2018-10-12, commit ede3a3b9) that affect single ImDrawList::AddText() calls with single strings larger than 10k. Text/TextUnformatted() calls were not affected, but e.g. InputText() was. omar 2018-11-30 23:47:23 +01:00
  • 84238240d6 Fixed a text rendering/clipping bug introduced in 1.66 (on 2018-10-12, commit ede3a3b9) that affect single ImDrawList::AddText() calls with single strings larger than 10k. Text/TextUnformatted() calls were not affected, but e.g. InputText() was. omar 2018-11-30 23:47:23 +01:00
  • 48f6fdb349 Fixed typo. omar 2018-11-30 18:25:12 +01:00
  • 7658035e5a About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose. omar 2018-11-30 18:18:15 +01:00
  • 3849def253 Added ShowAboutWindow(), About Window now showing various config/build information. omar 2018-11-30 17:15:03 +01:00
  • 025e00cccc About: Added build/system info relating to Docking branch. omar 2018-11-30 18:29:35 +01:00
  • f78b5a0cdb Merge branch 'viewport' into docking omar 2018-11-30 18:27:14 +01:00
  • ec49a486c7 About: Added build/system info relating to Viewport branch. omar 2018-11-30 18:27:04 +01:00
  • afeefadb4e Merge branch 'master' into viewport omar 2018-11-30 18:24:43 +01:00
  • a423f032ee About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose. omar 2018-11-30 18:18:15 +01:00
  • 4ef06f5aa2 Added ShowAboutWindow(), About Window now showing various config/build information. omar 2018-11-30 17:15:03 +01:00
  • 3335e6688f Include <alloca.h> also on macOS (and osxcross) (#2218) Sebastian Krzyszkowiak 2018-11-30 16:57:09 +01:00
  • b2e7a3806a Examples: Allegro5: Add touchscreen support Sebastian Krzyszkowiak 2018-11-30 16:46:43 +01:00
  • 1bfcf8f339 Separator: Fixed Separator() outputting an extraneous empty line when captured into clipboard/text/file. omar 2018-11-30 16:42:32 +01:00
  • 753223bd7b Merge branch 'viewport' into docking omar 2018-11-30 14:38:54 +01:00
  • f663277591 Merge misc/shallow changes from Docking branch to minimize drift: moved some blocks, added comments. omar 2018-11-30 14:33:43 +01:00
  • 1c7be88a1a Viewport: Fixed a bug where tooltips on their first frame didn't find a monitor leading to the "recovery" code to revert it to the main viewport for a frame. (#1542) omar 2018-11-30 14:13:51 +01:00
  • baf67d393f When the focused window become inactive don't restore focus to a window with the ImGuiWindowFlags_NoInputs flag. (#2213) omar 2018-11-29 23:24:22 +01:00
  • 4a94b251fd Comments omar 2018-11-29 22:00:17 +01:00
  • 3c114b280a Merge branch 'viewport' into docking omar 2018-11-29 21:30:26 +01:00
  • 2fbbcaa339 Viewport: Avoid calling platform functions when window is not created (apart from Platform_GetWindowDpiScale, documented as such). Main viewport situation is still ambiguous. (#1542) omar 2018-11-29 21:28:47 +01:00
  • 36cbe1e521 Viewport: Misc renaming. omar 2018-11-29 21:16:45 +01:00
  • 19d17ed274 Docking: Added io.ConfigDockingTransparentPayload option (to use with ImGuiConfigFlags_ViewportsNoMerge) omar 2018-11-29 15:56:51 +01:00
  • 01f940dc9a Viewport: imgui_impl_sdl2: Added support for PlatformIO Platform_SetWindowAlpha. omar 2018-11-28 22:50:37 +01:00
  • 19c4fa8dd5 Examples: DX12: Fixed compilation of imgui_impl_dx12.cpp in viewport branch. Multi-viewport is still not functional. omar 2018-11-28 15:41:17 +01:00
  • 3bcc25f588 Merge branch 'viewport' into docking omar 2018-11-27 19:56:23 +01:00
  • 4cadb57c46 Viewport: Comments. omar 2018-11-27 19:53:33 +01:00
  • 99c32ed4a5 Merge branch 'master' into viewport omar 2018-11-27 19:46:40 +01:00
  • c08b4b46f4 Viewport: Better support for toggling ImGuiConfigFlags_ViewportsEnable. (#2196) omar 2018-11-27 19:45:37 +01:00
  • 4105cc7e97 Added ImGuiConfigFlags_None, ImGuiBackendFlags_None for good measure. omar 2018-11-27 19:32:47 +01:00
  • e138a5fcb5 Docking: Fixed debug Rebuild operation. omar 2018-11-27 17:40:25 +01:00
  • 1fa2cb8748 imgui.h: Comments omar 2018-11-27 14:10:40 +01:00
  • ce07d55d1b imgui.h: Moved ImGuiListClipper omar 2018-11-27 13:58:52 +01:00
  • 8495c931c0 mgui.h: Moved ImGuiInputTextCallbackData,, ImGuiSizeCallbackData, ImGuiPayload structures so they are not in the "Helpers" section. omar 2018-11-27 13:57:20 +01:00
  • fc16e54612 Docking: Maintain CentralNode. When SetNextWindowDockID() on a now split node id, we dig to find the central node or the last focused node. (#2109) omar 2018-11-27 13:35:05 +01:00
  • 4575354bc0 Docking: Comments + maiintain LastFrameFocused per node + using bitfiield for docking bools. omar 2018-11-27 12:05:30 +01:00
  • 3f51c831de Docking: Added internal DockBuilderGetCentralNode(). Fixed being unable to undock whole node from dock button in DockSpace with a central node. (#2109) omar 2018-11-26 22:18:55 +01:00
  • 962dcb466d Docking: Added ImGuiDockNodeFlags_NoResize. (#2109) omar 2018-11-26 21:52:40 +01:00
  • b8d9c5c130 Merge branch 'viewport' into docking omar 2018-11-26 21:36:48 +01:00
  • 1a0d2578a1 Viewport: Merging fixes + relying on multiple viewport overlaps. Follow-up to previous attempts are reworking the split/merge mechanisms. (#1542) omar 2018-11-26 21:35:44 +01:00
  • 12a1e7d04e Viewport: Comment to suggest making WindowBg opaque when viewports are enabled. omar 2018-11-26 19:20:37 +01:00
  • 4a8efd7e68 Docking: Hidden tab-bar triangle reflects focus but using Button colors. (#2109) omar 2018-11-26 17:57:01 +01:00
  • 66cfbbff5e Docking: Fixed double-overlay when dragging window over one of the (four cardinal) outer drop boxes. (#2109) omar 2018-11-26 17:39:38 +01:00
  • d23c69d319 Docking: Added context menu option to hide the tab bar of single-window dock nodes, similar to Unreal. (#2109) omar 2018-11-26 17:25:06 +01:00
  • 1e7b50aeae Viewport: Fixes moving child menu viewport (fix 379733a). omar 2018-11-26 16:55:40 +01:00
  • c93e92671a Viewport: Fixes moving child menu viewport (fix 379733a). omar 2018-11-26 16:55:40 +01:00
  • ddc3f8f069 Merge branch 'viewport' into docking omar 2018-11-26 15:32:04 +01:00
  • 5261e5a6ba Merge branch 'master' into viewport omar 2018-11-26 14:53:51 +01:00
  • 379733aba1 Viewport: Fix viewport regression with protruding child window creating their own viewport. (fixes cae4d02, 760c1d95) (#1542) omar 2018-11-26 14:53:04 +01:00
  • 131de7ab62 Docking: Added ImGuiConfigFlags_DockingNoSplit flag. (#2109) omar 2018-11-23 18:42:16 +01:00