Commit Graph

5539 Commits (10fdc03a46921c71356d1e5c932a6f2ea1250f38)
 

Author SHA1 Message Date
omar d513546325 Merge branch 'master' into navigation
omar 5b062c4c29 Fixed typos
omar d2c65aa3e8 Examples: DirectX9/10/11: Tweak usage of SetCapture/ReleaseCapture. ()
ps: DirectX 12 example () may want to adopt that as well.
omar 0260fdd1c6 ColorButton: As a small convenience, provide a text baseline.
omar e9ff7162bc ColorButton: Fixed rendering color button with a checkerboard if the transparency comes from the global style.Alpha and not from the actual source color.
omar de72e9cc87 Internals: ImLerp() helper for ImVec4
omar f6ff373b22 Nav: #define IMGUI_HAS_NAV to ease sharing code across branches of imgui
omar 97bf2131e2 Fixed calling SetNextTreeNodeOpen() on a collapsed window leaking to next frame.
omar 20983773f1 Nav: MainMenuBar now releases focus when user gets out of the menu layer. WindowingTarget when applying focus to a window with only menus automatically sets the layer. ()
This is enough for basic mouse/gamepad usage, but 1- previous window gets an unfocused title bar color temporarily, 2- generaly for gamepad and especially keyboard we need much more to get this done right
omar 025d4f0c97 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar e7922b3fa0 Factorized some code (+ declared as static function without namespace, a pattern with the Nav branch has started to use)
omar 2ef2c104a1 Begin: Minor tweaks
omar be12f8c55d Nav: Fixed handling of ImGuiNavInput_KeyMenu so it doesn't set g.NavWindowingTarget at all, reducing size effects + handling menu layer toggle on Alt Release ()
omar 6f0aa766e1 Nav: Added internal ImGuiNavReadMode_Released test for key releases.
omar d769e2515a Merge branch 'master' into navigation
omar 50f5be9266 Examples: GLFW+GL2/GL3: Minor tweaks, comments.
omar d6a9956781 Examples: DirectX9/10/11: Added WM_SYSKEYDOWN / WM_SYSKEYUP handlers so e.g. VK_MENU can be read.
omar c14a66970b Examples: DirectX9/10/11: Renamed WndProc handler to use a generic Win32 name + returning 0 to all messages is more correct.
omar cb10da02f9 Merge branch 'Gargaj-patch-1'
omar a96f095deb Examples: DirectX10, DirectX11: Using SetCapture/ReleaseCapture to get correct behavior ()
ps: DirectX 12 example () may want to adopt that as well.
omar 3e0765ee22 Examples: DirectX9: Using SetCapture/ReleaseCapture to get correct behavior ()
omar e03198bb0f Fixed compilation for + coding style fixes.
omar c36e7fae93 Merge branch 'patch-1' of https://github.com/Gargaj/imgui into Gargaj-patch-1
omar 1bc1751670 MenuItem(): Tweaks to mimic exact spacing of BeginMenu() when inside a menu bar, which is a little misleading imho but may be useful. ()
omar b177f2432d MenuItem(): Tweak to not draw over all horizontal space when in horizontal layout mode. ()
omar b52e207758 Merge branch 'inolen-atlas_build_clear_font'
omar 7f880674e5 Font: Renamed ImFont::Clear() to ImFont::ClearOutputData() for consistency with what ImFontAtlas does. DisplayOffset is set by constructor but not reset by ClearOutputData. ()
omar fce41d0b55 Demo: Fixed Fonts "set as default button" not having collading id on collapsed nodes.
omar 08e411c310 Merge branch 'atlas_build_clear_font' of https://github.com/inolen/imgui into inolen-atlas_build_clear_font
omar 5fa81f2a26 Nav: Added ImGuiNavInput_KeyMenu aside from ImGuiNavInput_PadMenu as it is one differenciator between pad and keyboard that's very annoying with the keyboard.
Remove the move/resize behavior that appears than holding the button for a while. ()
omar 1c5b3fb1d2 Merge branch 'master' into navigation
omar f7259e60ee Comments
omar 23b9060468 Nav: Honoring ImGuiItemFlags_NoNav which is used by color picker ()
omar e4bb9102f9 Merge branch 'master' into navigation
omar 6ab737a4bb Popups: Fixed right-click to close popups not handling modal windows properly. (~#439)
omar aca23fd3f0 Popups: similarly to previous commit, we fix reopening a popup within a popup stack from truncating the whole stack. This is done by properly refocusing the lower level popup. (~#439)
omar 59a89774d7 Popups: fixed CloseInactivePopups() so that right-clicking to close one level of popups in a popups stack won't close the whole stack. This is done by properly refocusing the lower level popup. Fixes 87ae40843c (~#439)
omar 43df7eb5ea Added OpenPopupOnItemClick(); helper which mimic BeginPopupContextItem() but doesn't do the open.
Made the color popups uses this standard function so they handle reopening a context menu.
omar 0ea66dc260 Fixed bad merge from Master
omar 1172ff62e1 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h
omar 3cc10d25a9 BeginPopupContextItem(), BeginPopupContextWindow(): Using newly introduced IsItemHovered() flags to allow reopening another context menu (over same or not same item) with right-click. () (+1 squashed commits)
omar 695ea45fca IsWindowHovered(): Changed default behavior to now return false is a widget from another window is active + Added support for ImGuiHoveredFlags_AllowWhenBlockedByActiveItem. (relate to drag'n drop idoms: )
omar 564ff2dfd3 IsItemHovered(), IsWindowHovered(): added flags to enable various and more specific behavior. Will enable improvements for popups/context menus and drag'n drop. (relate ~#439, , , )
The legacy confusing IsItemRectHovered(), IsWindowRectHovered() can be completely removed now.
Changed IsWindowHovered() behavior with default parameter: it now return false is the window is blocked by a popup.
Demo: Added tests for those two functions.
omar d29a6a5a5a Moved IMGUI_DISABLE_OBSOLETE_FUNCTIONS block lower in the imgui.h file so obsolete functions can use flags. Also sane to quarantine them outside of the respectable area.
omar e6f06627e9 Made the ImGuiWindowFlags_NoMove flag inherited from parent to child, so in a setup with RootWindow (no flag) -> Child (NoMove flag) -> SubChild (no flag) user won't be able to move the root window by clicking on SubChild. ()
omar 3b485cda51 Fixed a bug allowing to move a _NoMove window from a child that doesn't have the flag. ()
broken by e56eba44fe ()
omar 87ae40843c Popups: popups can be closed with a right-click anywhere, without altering focus under the popup.(~#439)
omar 853018dd4d Popups: Fixed a bug introduced in 1a35766356 which made the BeginPopupContextXXX functions create popups without border. (nb: all that border mess is going away in styling clean up)
omar 5f7299e15a Refactor EndFrame() code that process focusing window with left mouse button. This commit should be no-op.
omar 2a32a2e662 Demos: Tweaks of popups/context/menus section.