3520 Commits (81cbaef8068fdcbd1d4b4cb1cea23f1dacc3ab0e)
 

Author SHA1 Message Date
omar d769e2515a Merge branch 'master' into navigation 7 years ago
omar 50f5be9266 Examples: GLFW+GL2/GL3: Minor tweaks, comments. 7 years ago
omar d6a9956781 Examples: DirectX9/10/11: Added WM_SYSKEYDOWN / WM_SYSKEYUP handlers so e.g. VK_MENU can be read. 7 years ago
omar c14a66970b Examples: DirectX9/10/11: Renamed WndProc handler to use a generic Win32 name + returning 0 to all messages is more correct. 7 years ago
omar cb10da02f9 Merge branch 'Gargaj-patch-1' 7 years ago
omar a96f095deb Examples: DirectX10, DirectX11: Using SetCapture/ReleaseCapture to get correct behavior (#1375)
ps: DirectX 12 example (#302) may want to adopt that as well.
7 years ago
omar 3e0765ee22 Examples: DirectX9: Using SetCapture/ReleaseCapture to get correct behavior (#1375) 7 years ago
omar e03198bb0f Fixed compilation for #1375 + coding style fixes. 7 years ago
omar c36e7fae93 Merge branch 'patch-1' of https://github.com/Gargaj/imgui into Gargaj-patch-1 7 years ago
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. (#1387) 7 years ago
omar b177f2432d MenuItem(): Tweak to not draw over all horizontal space when in horizontal layout mode. (#1387) 7 years ago
omar b52e207758 Merge branch 'inolen-atlas_build_clear_font' 7 years ago
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. (#1349) 7 years ago
omar fce41d0b55 Demo: Fixed Fonts "set as default button" not having collading id on collapsed nodes. 7 years ago
omar 08e411c310 Merge branch 'atlas_build_clear_font' of https://github.com/inolen/imgui into inolen-atlas_build_clear_font 7 years ago
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. (#787)
7 years ago
omar 1c5b3fb1d2 Merge branch 'master' into navigation 7 years ago
omar f7259e60ee Comments 7 years ago
omar 23b9060468 Nav: Honoring ImGuiItemFlags_NoNav which is used by color picker (#787) 7 years ago
omar e4bb9102f9 Merge branch 'master' into navigation 7 years ago
omar 6ab737a4bb Popups: Fixed right-click to close popups not handling modal windows properly. (~#439) 7 years ago
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) 7 years ago
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) 7 years ago
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.
7 years ago
omar 0ea66dc260 Fixed bad merge from Master 7 years ago
omar 1172ff62e1 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h
7 years ago
omar 3cc10d25a9 BeginPopupContextItem(), BeginPopupContextWindow(): Using newly introduced IsItemHovered() flags to allow reopening another context menu (over same or not same item) with right-click. (#439) (+1 squashed commits) 7 years ago
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: #143) 7 years ago
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, #1013, #143, #925)
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.
7 years ago
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. 7 years ago
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. (#1381) 7 years ago
omar 3b485cda51 Fixed a bug allowing to move a _NoMove window from a child that doesn't have the flag. (#1381)
broken by e56eba44fe (#1337)
7 years ago
omar 87ae40843c Popups: popups can be closed with a right-click anywhere, without altering focus under the popup.(~#439) 7 years ago
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) 7 years ago
omar 5f7299e15a Refactor EndFrame() code that process focusing window with left mouse button. This commit should be no-op. 7 years ago
omar 2a32a2e662 Demos: Tweaks of popups/context/menus section. 7 years ago
omar e384078d7a IO: reordering some supposedly private fields. 7 years ago
omar 51eed2f257 Merge branch 'master' into navigation 7 years ago
omar 5b699517d4 Internals: PaintVerts** renamed to ShadeVerts**, moved to imgui_draw.cpp and exposed in imgui_internal.h (+1 squashed commits) 7 years ago
omar 22977ffedb Documentation: Extra comments + tweaks to make usage of long-line more bearable. 7 years ago
omar d3c2e904d8 Internals: Added ImLinearSweep() helper. 7 years ago
omar 938f1b720f Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
7 years ago
omar 370a48c10b Internals: RenderCollapseTriangle() -> RenderTriangle(), takes a ImGuiDir 7 years ago
omar 073dd60b4b Merge branch 'master' into navigation 7 years ago
omar a03093b2d4 CollapsingHeader(bool*) variant: fixed for IsItemHovered() to work properly in the nav branch.Basically the close button now has to use ItemAdd() to be navable into, which overwrite the IsItemHovered data. (#600, #787) 7 years ago
omar 29a652adee CollapsingHeader(bool*) variant: fixed for IsItemHovered() to work properly in the nav branch.Basically the close button now has to use ItemAdd() to be navable into, which overwrite the IsItemHovered data. (#600, #787) 7 years ago
omar a126c702d9 Merge branch 'master' into navigation
# Conflicts:
#	imgui_internal.h
7 years ago
omar ef3f87eec5 Internals: ButtonBehavior: made ImGuiButtonFlags_PressedOnClick and ImGuiButtonFlags_PressedOnDoubleClick set the click offset correctly + hold on g.ActiveId so Held state can be reported. Added ImGuiButtonFlags_NoHoldingActiveId flag to disable the later. 7 years ago
omar 1c4af303bf Internals:Helpers: Added ImSwap(int,int), exposed ImStrncpy(). 7 years ago
omar bf778ebb7e Checkbox: Using checkmark. MenuItem: Tweaked checkmark, thicker. 7 years ago