omar
|
6b32570644
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui_internal.h
# imgui_widgets.cpp
|
2019-01-07 21:29:15 +01:00 |
|
omar
|
5af930f97a
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2019-01-07 21:28:29 +01:00 |
|
omar
|
1ae7f88495
|
Tabs: Added ImGuiTabBarFlags_NoTooltip flag. (#261, #351) + added helpful assert
|
2019-01-07 18:07:09 +01:00 |
|
omar
|
5cb7ce2085
|
Renamed ImFont::GlyphRangesBuilder to ImFontGlyphRangesBuilder. Keep redirection typedef (will obsolete).
|
2019-01-06 16:59:51 +01:00 |
|
omar
|
1353c74dcf
|
Comments/formatting on obsolete stuff
|
2019-01-06 16:37:57 +01:00 |
|
omar
|
c3af134cc8
|
IO: Renamed InputCharacters[], marked internal as was always intended. AddInputCharacter() goes into a queue which can receive as many characters as needed during the frame. This is useful for automation to not have an upper limit on typing speed. Will later transition key/mouse to use the event queue later.
|
2019-01-06 16:37:42 +01:00 |
|
omar
|
1705a81efb
|
Moved ImVector higher up in imgui :( because we will need it in ImGuiIO.
|
2019-01-06 16:29:40 +01:00 |
|
omar
|
9ba202821f
|
Nav: Fixed an keyboard issue where holding Activate/Space for longer than two frames on a button would unnecessary keep the focus on the parent window, which could steal it from newly appearing windows. (#787)
|
2019-01-04 19:03:56 +01:00 |
|
omar
|
d223d1e951
|
Added bindings in Readme. Added internal IMGUI_DEBUG_LOG() helper. Comments, missing breaking changes note relative to imgui_impl_xxxx changes, not really part of core but worth adding in the imgui.cpp breaking change section.
|
2019-01-04 18:01:43 +01:00 |
|
omar
|
4e98d4329b
|
Comments
|
2019-01-03 21:59:13 +01:00 |
|
omar
|
5278da98d2
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_demo.cpp
|
2019-01-03 21:40:08 +01:00 |
|
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)
|
2019-01-03 21:33:33 +01:00 |
|
omar
|
c8349d3305
|
Viewport: Added ConfigViewportsNoParent to parent viewport default to NULL and not main viewport. Fix eg.. popups appearing erroneously focusing parent window.
|
2019-01-03 21:28:54 +01:00 |
|
omar
|
ce1626a51e
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2019-01-02 21:36:21 +01:00 |
|
omar
|
0cabe4dedf
|
Viewport: Added ImGuiWindowClass / SetNextWindowClass() (concept imported from Docking ImGuiDockFamily), which currently allows to overwrite viewport flags on a per-window basis. Exposed FindViewportByID(). Win32: Support for ParentViewportId. (#1542)
|
2019-01-02 21:33:23 +01:00 |
|
omar
|
0d6e3ab2b0
|
Docking: Renamed SetNextWindowId() -> SetNextWindowID() for consistency. (function vs member are still horribly inconsistent atm)
|
2019-01-02 21:28:16 +01:00 |
|
omar
|
4a6f95acc8
|
Viewport: Added Platform_UpdateWindow hook for general purpose: Rework Win32 code to reflect viewport flags changes into Win32 while the window is active.
|
2019-01-02 19:03:36 +01:00 |
|
omar
|
5305c32242
|
Viewport: Reorder flags. Set owned viewport common decoration flags in Begin(). Moved code in UpdateViewportsEndFrame() before we introduce family/class based overrides.
|
2019-01-02 19:03:11 +01:00 |
|
omar
|
951c9dd68b
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
2019-01-02 19:00:31 +01:00 |
|
omar
|
e194219f2e
|
Renamed ImGuiDockFamily to ImGuiWindowClass. Renamed CompatibleWithClassZero to DockingAllowUnclassed. (#2109)
|
2019-01-02 16:22:44 +01:00 |
|
omar
|
acacd93836
|
Renamed extra_flags to flags in InputXXX parameters.
|
2019-01-02 11:08:14 +01:00 |
|
omar
|
6b97ded438
|
Happy new year! & comments
|
2019-01-02 10:57:57 +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
|
89ac0ea7c1
|
Various user-facing comments
|
2018-12-19 11:19:55 +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
|
ac9512e095
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2018-12-14 18:46:24 +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
|
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
|
991b16cc6a
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_widgets.cpp
|
2018-12-11 19:46:46 +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
|
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 |
|
omar
|
15447f5b7b
|
Using named flags instead of 0 + shallow formatting tweaks from other branches.
|
2018-12-11 12:14:27 +01:00 |
|
omar
|
e6439e1a16
|
Merge branch 'viewport' into docking + moved io.ConfigFlags ImGuiConfigFlags_DockingNoSplit to io.ConfigDockingNoSplit
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
|
2018-12-10 16:21:49 +01:00 |
|
omar
|
26b9e2d0a5
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2018-12-10 16:14:31 +01:00 |
|
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.
|
2018-12-10 16:05:30 +01:00 |
|
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.
|
2018-12-10 15:41:01 +01:00 |
|
omar
|
f768727284
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
|
2018-12-06 16:36:17 +01:00 |
|
omar
|
a03846bd9e
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-12-06 16:33:39 +01:00 |
|