omar
|
32c4e01267
|
Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!)
|
6 years ago |
|
omar
|
2f9bae140b
|
Docking: Demo: Fixed docking document window into parent window. (#2286)
|
6 years ago |
|
omar
|
8a45c56c2c
|
Merge branch 'viewport' into docking
|
6 years ago |
|
omar
|
9391a97fbf
|
Merge branch 'master' into viewport
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
|
6 years ago |
|
omar
|
95ee99e6aa
|
Version 1.68 WIP
|
6 years ago |
|
omar
|
515ad62335
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/TODO.txt
|
6 years ago |
|
omar
|
73353fad64
|
Merge branch 'master' into viewport
|
6 years ago |
|
omar
|
b8c6e31c2d
|
Fixed cursor issue caused by 6890e08b when calling BeginChild/EndChild multiple times to reappend into a same child window. (#2282)
|
6 years ago |
|
omar
|
ff4bd758ca
|
Merge branch 'viewport' into docking
|
6 years ago |
|
omar
|
e24674fc0e
|
Merge branch 'master' into viewport
|
6 years ago |
|
omar
|
7a5058e3bf
|
Version 1.67
|
6 years ago |
|
omar
|
6e41745f31
|
Added a bunch of diagnostic ignore to cope with Clang -Weverything being absurd. Also fixed two legit warnings. (#2277)
|
6 years ago |
|
omar
|
529fccd9c2
|
Merge branch 'viewport' into docking
|
6 years ago |
|
omar
|
4ee4f65c70
|
Merge branch 'master' into viewport
|
6 years ago |
|
omar
|
7e78865613
|
Demo: Fixed bounds of DragFloat in Clipping section to avoid passing zero-sized to InvisibleButton().
|
6 years ago |
|
omar
|
8011197c50
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
c96aaef132
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
f53cd3ee0f
|
Internals: LowerBound: Use raw pointer typedefs, we never use iterator anywhere else in the codebase.
Demo: Typo.
C98 fix.
|
6 years ago |
|
omar
|
6b32570644
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui_internal.h
# imgui_widgets.cpp
|
6 years ago |
|
omar
|
5af930f97a
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
6 years ago |
|
omar
|
50faccf764
|
Demo: Log: Comments. Using clipper. Not linking with rand() anymore.
|
6 years ago |
|
omar
|
5278da98d2
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_demo.cpp
|
6 years ago |
|
omar
|
e1ed27aeaa
|
(Breaking change) Reorganized Viewports advanced flags, moved into new io.ConfigViewportsXXX flags. Pay attention that ImGuiConfigFlags_ViewportsDecoration became ConfigViewportsNoDecoeration, so the value is inverted! (#1542)
|
6 years ago |
|
omar
|
c8349d3305
|
Viewport: Added ConfigViewportsNoParent to parent viewport default to NULL and not main viewport. Fix eg.. popups appearing erroneously focusing parent window.
|
6 years ago |
|
omar
|
ce1626a51e
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
6 years ago |
|
omar
|
0d6e3ab2b0
|
Docking: Renamed SetNextWindowId() -> SetNextWindowID() for consistency. (function vs member are still horribly inconsistent atm)
|
6 years ago |
|
omar
|
951c9dd68b
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
6 years ago |
|
omar
|
e194219f2e
|
Renamed ImGuiDockFamily to ImGuiWindowClass. Renamed CompatibleWithClassZero to DockingAllowUnclassed. (#2109)
|
6 years ago |
|
omar
|
c738f9ef92
|
InputFloat: When using ImGuiInputTextFlags_ReadOnly the step buttons are disabled. (#2257)
|
6 years ago |
|
omar
|
e043b89814
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.h
|
6 years ago |
|
omar
|
02501f07c3
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
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
|
84d1ce3958
|
Tidying up README, moved entries to FAQ, updated screenshots, removed comma in title.
|
6 years ago |
|
omar
|
9c916cdaf9
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
ac9512e095
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
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
|
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
|
991b16cc6a
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_widgets.cpp
|
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
|
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 |
|
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
|
e6439e1a16
|
Merge branch 'viewport' into docking + moved io.ConfigFlags ImGuiConfigFlags_DockingNoSplit to io.ConfigDockingNoSplit
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
|
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 |