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
|
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
|
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
|
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
|
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
|
c40feabe4d
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
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.
|
6 years ago |
|
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)
|
6 years ago |
|
omar
|
15447f5b7b
|
Using named flags instead of 0 + shallow formatting tweaks from other branches.
|
6 years ago |
|
omar
|
26b9e2d0a5
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
6 years ago |
|
omar
|
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.
|
6 years ago |
|
omar
|
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.
|
6 years ago |
|
omar
|
d20e3ee710
|
Tests: Adding imgui-test engine hooks (experimental) to provide missing widget state to the testing system.
|
6 years ago |
|
omar
|
a03846bd9e
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
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.
|
6 years ago |
|
omar
|
ac52d9d44c
|
Viewport: Fix handling of PlatformRequestResize/PlatformRequestPos. when OS decoration are enabled via ImGuiConfigFlags_ViewportsDecoration .
|
6 years ago |
|
omar
|
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.
|
6 years ago |
|
omar
|
b58bd5b311
|
Version 1.67 WIP + todo notes
|
6 years ago |
|
omar
|
3a678d48b1
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
|
6 years ago |
|
omar
|
fb6ef8b1db
|
Comments, tweak
|
6 years ago |
|
omar
|
f6b6ad1959
|
Viewport: Minor tweaks, better struct layout.
|
6 years ago |
|
omar
|
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.
|
6 years ago |
|
omar
|
eb311abc92
|
Fixed IMGUI_API tag on ImFontAtlas::IsBuilt() preventing to build as DLL on some setups. (#2226)
|
6 years ago |
|
omar
|
8d58055a54
|
Examples: DirectX10/11/12: Made imgui_impl_dx10/dx11/dx12.cpp link d3dcompiler.lib from the .cpp file to ease integration.
|
6 years ago |
|
omar
|
10e13dd6bb
|
Version 1.67 WIP (again, this time IMGUI_VERSION_NUM has leeway for another hot-fix).
|
6 years ago |
|
omar
|
89a530b442
|
Somehow VS keeps modifying this GUID so I am going to playing along with it.
|
6 years ago |
|
omar
|
65e579e558
|
Merge branch 'master' into viewport
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_vulkan.cpp
# examples/imgui_impl_win32.cpp
# imgui.h
# imgui_demo.cpp
|
6 years ago |