Commit Graph

427 Commits (664ab85f76d59023684e077ea5654bbaeea3abc0)

Author SHA1 Message Date
omar e916310b2e Version 1.53
omar 3d48f5b8c2 Demo: BeginCombo() demo code
omar de5c304b49 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar 8d54b1b7af Misc comments, removed duplicated IM_ARRAYSIZE macro in imgui_demo.cpp (it is now declared in imgui.h)
omar 1b86e7343f Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).
omar cead207535 Comments
omar ffb4f6ca8c Merge branch 'master' into navigation
omar 983d8f5f8e Various zealous warning fixes (Clang).
omar 1c1e490316 Merge branch 'master' into navigation
omar e1a103b251 Drag and Drop: Disable tracking mouse button ownership when an external drag source is active, to make it easier to achieve drag and drop over multiple OS windows. ()
omar 287380261c Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar 996dfb21cf ImDrawList: Added ImDrawListFlags for AA settings. ImDrawList doesn't directly depends on GImGui anymore.
omar 6497f5dc1b Merge branch 'master' into navigation
# Conflicts:
#	imgui.h
omar eefea0588a Using the ImGuiWindowFlags_NoScrollWithMouse flag on a child window forwards the mouse wheel event to the parent window, unless either ImGuiWindowFlags_NoInputs or ImGuiWindowFlags_NoScrollbar are also set. (, )
omar fa68cb5364 Demo: Console: Tweak.
omar cc3192f347 Merge branch 'master' into navigation
# Conflicts:
#	imgui_internal.h
omar 3905816082 Added ShowFontSelector(), ShowStyleSelector(). ()
omar fa9327ccf8 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_draw.cpp
#	imgui_internal.h
omar d0a1be0de0 Merge branch 'drag_and_drop'
Branimir Karadžić ef1a683ebe Removed use of obsolete ImGui API.
omar 052b6021dd Merge branch 'master' into drag_and_drop
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
omar 0a3db267c3 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h
omar 6190ab0084 Renamed GetItemsLineHeightWithSpacing() to GetFrameHeightWithSpacing()
omar 08b72eb5c0 IsWindowFocused() refactor will flags. ()
Marked IsRootWindowFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootWindow).
Marked IsRootWindowOrAnyChildFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows).
omar 8d8f4934fb Demo: mouse dragging demo tweaks
omar 4a555d35f0 IsWindowHovered(): split ImGuiHoveredFlags_FlattenChild into separate ChildWindows and RootWindow flags. Allowing more combination and a better symetry with IsWindowFocused() flags. ()
omar 2b9d8ab91d Merge branch 'master' into drag_and_drop
# Conflicts:
#	imgui.cpp
#	imgui.h
omar 38bfdb357e Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
Branimir Karadžić e67f3809ed Replaced obsolete function with new one.
omar d1db229907 Merge branch 'master' into navigation
# Conflicts:
#	imgui_demo.cpp
omar 71296910a0 Demo: Tweaks and spacing. Stopped using rand() function in demo code.
omar 4b8857d536 Demo: About box tweaks.
omar 20ba79aa56 Demo: Added "No close" option.
omar 871a5cecc1 Merge branch 'master' into navigation
omar c9f0275e22 Combo: Removed ImGuiWindowFlags_ComboBox flag. Moved internal window flags.
omar a4863e8084 Demo: Picker with palette demo supports drag and drop. (, )
omar e6215b6ca0 Merge branch 'master' into navigation + merge fix
# Conflicts:
#	imgui.cpp
omar abe5ad3c7a Demo: Added display for IsMouseDragging() function.
omar 94bf12f14b Demo: Display better mouse cursor info for debugging backends.
omar 81cbaef806 Merge branch 'master' into navigation
omar 0d53c8d480 Demo: Console: Fixed incorrect positioning which was hidden by a minor scroll issue (this would affect people who copied the console code as is)
omar a20fe279c5 Demo: Layout: Removed unnecessary BeginChild/EndChild calls
omar 9191b17218 Merge branch 'master' into navigation
omar 532f564fd3 ImGuiTextBuffer: Renamed append() helper to appendf(), appendv() to appendfv(). Added reserve().
omar 2543807e56 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
omar 3f5b2a3fe3 Exposed ImDrawCornerFlags, replaced occurences of ~0 with an explicit ImDrawCornerFlags_All. Inversed BotLeft (prev 1<<3, now 1<<2) and BotRight (prev 1<<2, now 1<<3).
omar 3c5e64db78 Demo: Tweaked Image() code.
omar 9848a7023b Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
omar 28a31997b7 Style Editor: Simplified settings also show PopupBorderSize as a checkbox. (, )
omar abbf836fd0 Style, Begin: removed ImGuiWindowFlags_ShowBorders window flag. Borders are now fully set up in the ImGuiStyle structure (see e.g. style.FrameBorderSize, style.WindowBorderSize). Use ImGui::ShowStyleEditor() to look them up. (, fix , , ref , ref )
omar 4cdd998be8 Demo: Fix warning "format not a string literal and no format arguments" for over-zealous compilers settings. (, )
omar d211a0e338 Merge branch 'master' into navigation (with style breakable)
# Conflicts:
#	imgui.cpp
#	imgui_draw.cpp
omar d7af1a218e Style: Added PopupRounding setting. ()
omar 0a61b7195c Style: Added a default StyleColorsLight(). ()
omar e7e81b265d Demo: Tweaks.
omar 1c41603b31 Style Editor: Using local storage so Save/Revert button made some more sense without code passing its storage. Tweaked layout, added horizontal scroll bar, Fixed Save/Revert button to be always accessible. (fix )
omar c1b5eab868 Style Editor: Sneakily adding a combo box to change colors ()
omar bd4bc929ce Style: renamed style.ChildWindowRounding to style.ChildRounding, ImGuiStyleVar_ChildWindowRounding to ImGuiStyleVar_ChildRounding.
omar 6817f3a3d9 Merge branch 'master' into navigation
omar 27fd1b913b Made it guaranteed by API that after calling Begin() the last Item represent the title bar. ()
omar 64031852de Merge branch 'master' into navigation
omar 6001d9c7a4 Columns: Clipping columns borders on Y axis on CPU because some GPU drivers appears to be unhappy with triangle spanning large regions (not sure why tbh). ()
Demo: Columns: Adding a billion of extra lines and using clipper.
omar 0858c3d7cb Demo: Custom Rendering: Fixed clipping rectangle extruding out of parent window.
omar a297cbafdb Merge branch 'master' into navigation
omar 8e6adc78af Examples: Constrained Resize: Added more test cases (for )
omar 0d4c320f88 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_draw.cpp
omar ff4d4ca651 IsWindowHovered(): Added ImGuiHoveredFlags_FlattenChilds flag. Made IsRootWindowOrAnyChildHovered() obsolete in favor of IsWindowHovered( ImGuiHoveredFlags_FlattenChilds) (, )
omar 63f6f2dd13 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
omar 59323b54da Demo: Comments ()
omar 6ab20ff9bf Minor tweaks to the user guide.
omar edafbcd630 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
omar 77df1ba9e0 Version 1.53 WIP
omar c0b366b316 Merge branch 'master' into navigation
# Conflicts:
#	imgui.h
omar 9f200d10d5 Version 1.52
omar fc25881207 Merge branch 'master' into navigation
omar 1f3372b7f1 ImFormatString, ImFormatStringV(): clarifying specs so that passing a NULL buffer should return the desired length. ()
omar d769e2515a Merge branch 'master' into navigation
omar fce41d0b55 Demo: Fixed Fonts "set as default button" not having collading id on collapsed nodes.
omar e4bb9102f9 Merge branch 'master' into navigation
omar 6ab737a4bb Popups: Fixed right-click to close popups not handling modal windows properly. (~#439)
omar 1172ff62e1 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h
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 2a32a2e662 Demos: Tweaks of popups/context/menus section.
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. (, )
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. (, )
omar d96b6ecf88 Merge branch 'master' into navigation
# Conflicts:
#	imgui_demo.cpp
omar 2739b6ebcd Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed bg_alpha from internal BeginEx(). (3)
omar 1a35766356 BeginPopupContextItem() now supports a NULL string identifier and uses the last item ID if available. For interactive items (that have an ID) this works! For non interactive items we assert.
omar 3833f1f7a2 Merge branch 'master' into navigation
omar 43b4a81b3e Rnamed AlignFirstTextHeightToWidgets() to AlignTextToFramePadding(). Kept inline redirection function (will obsolete).
omar c6e370a77a TreeNode: Added ImGuiTreeNodeFlags_FramePadding flag
omar 59c6f35bf6 Added ActivateItem(), GetItemID() functions.
omar 518f02f4de Demo: better demo for SetKeyboardFocusHere()
omar 0046c618b0 Nav: Allow to collapse tree nodes with NavLeft and open them with NavRight (, )
omar cf308f4039 Nav: Fixed SetItemDefaultFocus from stealing default focus when we are initializing default focus for a menu bar layer ()
omar 3b85a8b6a0 Demo: Added an extra test related to baseline and fixed an id collision.
omar 7c2926de17 Demo: Added an extra test related to baseline and fixed an id collision.
omar d394c7ad0b Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
omar 0106dcbd02 Fixed IsItemHovered() - part of the processing has to be done in ItemAdd() because the widget may alter clipping rectangle temporarily.