github.com/advancedfx/imgui commits | Ecosyste.ms: OpenCollective

Merge branch 'patch-1' of https://github.com/Gargaj/imgui into Gargaj-patch-1

c36e7fae93eb123b049e52d0756524792bd56f38 authored over 7 years ago

MenuItem(): Tweaks to mimic exact spacing of BeginMenu() when inside a menu bar, which is a little misleading imho but may be useful. (#1387)

1bc17516706652ae662d8837374473fd93f5ac6e authored over 7 years ago

MenuItem(): Tweak to not draw over all horizontal space when in horizontal layout mode. (#1387)

b177f2432dd9ab90f765adf39a6376e4ddea7bb9 authored over 7 years ago

Merge branch 'inolen-atlas_build_clear_font'

b52e2077588859e61a579f201dd5b551f6f2df00 authored over 7 years ago

Font: Renamed ImFont::Clear() to ImFont::ClearOutputData() for consistency with what ImFontAtlas does. DisplayOffset is set by constructor but not reset by ClearOutputData. (#1349)

7f880674e5c3e594ac034215252b7d1455a1579f authored over 7 years ago

Demo: Fixed Fonts "set as default button" not having collading id on collapsed nodes.

fce41d0b5569ceaf9e7901a013efc68980d57662 authored over 7 years ago

Merge branch 'atlas_build_clear_font' of https://github.com/inolen/imgui into inolen-atlas_build_clear_font

08e411c310482a6ea768088a233ce80ecf0e39f4 authored over 7 years ago

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)

5fa81f2a26636d5fb238aa0bd57c2d7ea9d205bf authored over 7 years ago

Merge branch 'master' into navigation

1c5b3fb1d2651b7ea4a556e72e557fd26769f50c authored over 7 years ago

Comments

f7259e60eea334e274d797ca3d3c6536e85e7ca2 authored over 7 years ago

Nav: Honoring ImGuiItemFlags_NoNav which is used by color picker (#787)

23b9060468731259f449f3efb0d1d6c531c02b59 authored over 7 years ago

Merge branch 'master' into navigation

e4bb9102f9c8809fd379ec158ff009391b27233c authored over 7 years ago

Popups: Fixed right-click to close popups not handling modal windows properly. (~#439)

6ab737a4bb288d553f4de3e3841e393ef96d32a0 authored over 7 years ago

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)

aca23fd3f0eb1b6fb109840f5fc942c49312d096 authored over 7 years ago

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 87ae40843c0b5c526edd9cdb62b072cd0bcc49ff (~#439)

59a89774d79ee5d39c38a0f0721702e2322e7bf5 authored over 7 years ago

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.

43df7eb5ea1fe744e2bcb4aa24c3f2df28388321 authored over 7 years ago

Fixed bad merge from Master

0ea66dc260522b4b4c3cecc508242a7555cdc8fc authored over 7 years ago

Merge branch 'master' into navigation

# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h

1172ff62e1a3d3b094b8ed1588120b2d0efc9b33 authored over 7 years ago

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)

3cc10d25a97a4eeba0dda8d02f3e0ed9c6e13c72 authored over 7 years ago

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)

695ea45fca41debe15c0ed2fe86ff0bc8961d67e authored over 7 years ago

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.
Ch...

564ff2dfd379d40568879a5bc89e8cfea7e51d2f authored over 7 years ago

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.

d29a6a5a5a22cd114557854c918b3d3c1a8262b6 authored over 7 years ago

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)

e6f06627e9cc7b47b4b428f15dc6d4c1910e7a18 authored over 7 years ago

Fixed a bug allowing to move a _NoMove window from a child that doesn't have the flag. (#1381)

broken by e56eba44fe0724a64f88f041fddad2eac3661cc3 (#1337)

3b485cda51807b9a29cb0ba3a3e22c2b500f7cdc authored over 7 years ago

Popups: popups can be closed with a right-click anywhere, without altering focus under the popup.(~#439)

87ae40843c0b5c526edd9cdb62b072cd0bcc49ff authored over 7 years ago

Popups: Fixed a bug introduced in 1a35766356032a77bed1e9f16bdfcd60b93784cf which made the BeginPopupContextXXX functions create popups without border. (nb: all that border mess is going away in styling clean up)

853018dd4dff37ffeb32f89980a52c300e84dc35 authored over 7 years ago

Refactor EndFrame() code that process focusing window with left mouse button. This commit should be no-op.

5f7299e15a28fbadc693bdc90184e23c367b488e authored over 7 years ago

Demos: Tweaks of popups/context/menus section.

2a32a2e66297a2a3c0bd73f87c0aa991d4c15707 authored over 7 years ago

IO: reordering some supposedly private fields.

e384078d7aad79607f32a5db87ebc004cc6b5c56 authored over 7 years ago

Merge branch 'master' into navigation

51eed2f257a7ac41848ab67b31af0c0a2d7699a8 authored over 7 years ago

Internals: PaintVerts** renamed to ShadeVerts**, moved to imgui_draw.cpp and exposed in imgui_internal.h (+1 squashed commits)

5b699517d43b6998fa6f432edb9d991497bad690 authored over 7 years ago

Documentation: Extra comments + tweaks to make usage of long-line more bearable.

22977ffedb0b6bc701521fd11d0c610d3e991bf2 authored over 7 years ago

Internals: Added ImLinearSweep() helper.

d3c2e904d8e3b7310fb4e2a8a3984caf3f94171d authored over 7 years ago

Merge branch 'master' into navigation

# Conflicts:
# imgui.cpp

938f1b720fc76c9b3f8c9a4e3d349e093c4c4e7d authored over 7 years ago

Internals: RenderCollapseTriangle() -> RenderTriangle(), takes a ImGuiDir

370a48c10bbda08cbf0ba63ade49f64f843b8bd4 authored over 7 years ago

Merge branch 'master' into navigation

073dd60b4b3adfd1691406d068f588b61a7490cb authored over 7 years ago

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)

a03093b2d44f978d432fb81a85fd61e8cd9eb18d authored over 7 years ago

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)

29a652adeec8e9e0dafb5f79f06769ad3442ea3a authored over 7 years ago

Merge branch 'master' into navigation

# Conflicts:
# imgui_internal.h

a126c702d9624d45e3136f92f6a47ae3ca7eb5bf authored over 7 years ago

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.

ef3f87eec587179c0a82634f481412e25c707d15 authored over 7 years ago

Internals:Helpers: Added ImSwap(int,int), exposed ImStrncpy().

1c4af303bfc7387d36d95132d32ea40d95f8f4d4 authored over 7 years ago

Checkbox: Using checkmark. MenuItem: Tweaked checkmark, thicker.

bf778ebb7edd73176c76469eb7869e56854c16d3 authored over 7 years ago

Merge branch 'master' into navigation

# Conflicts:
# imgui_demo.cpp

d96b6ecf887d6ac1a3e54cab17ce926f70566b71 authored over 7 years ago

Begin: Marked 5 parameters version of Begin() as obsolete. Now waiting for a riot to happen!

03b76bf05b3b33718773383265db417c1b9dc7a7 authored over 7 years ago

Begin: Work toward obsoleting the 5-arguments Begin() overload. Internal BeginEx() becomes the normal public Begin() again! (4)

78a85ba3fecd931cbc7f8c37c6a5e519dc101c23 authored over 7 years ago

Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed bg_alpha from internal BeginEx(). (3)

2739b6ebcde4772bb51efe961a72fd4864eafa42 authored over 7 years ago

Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed size_on_first_use from internal BeginEx(). (2)

4aa9d2089dbdfb55e13d0f1a164d124a07e36880 authored over 7 years ago

Begin: Work toward obsoleting the 5-arguments Begin() overload. (1)

55d873875e62d952f1b26ac87ba3bd95de2f29bc authored over 7 years ago

Capture/release window in DX9 implementation

This helps a lot when the user drags a slider but carries the cursor offscreen before releasing ...

839067fda9e2ffa34c2e8bfc36be2c94fddcab53 authored over 7 years ago

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.

1a35766356032a77bed1e9f16bdfcd60b93784cf authored over 7 years ago

Fix IsItemHovered() issue on child by temporarily reverting 344d48be31e1fae98c9f7cb6d96b6d77d29abec0. This is not the ideal solution. (Fix #1370)

c76f0142927db9b9585380713a4829336d1c0b24 authored over 7 years ago

Nav: InputTextMultiline: Fixed navigation/selection. Disabled selecting all when activating a multi-line text editor. (#787)

af565ea82810b89c2e1c317be8a7c91bd8014d5e authored over 7 years ago

Nav: InputTextMultiline: Fixed navigation/selection. Disabled selecting all when activating a multi-line text editor. (#787)

7ea52ac1e41996f48bcd3de74bf32e6603c0242e authored over 7 years ago

Nav: InputText: Fixed using Up/Down history callback feature when Nav is enabled (#787)

82a27fd3aaf78cafc4bec2ef18729f225ad8fefb authored over 7 years ago

Nav: Internals: Moved some internal code to namespace, comments

b70c2fa8879bf24b6bdd7c87a87eca1ff1fdd389 authored over 7 years ago

Nav: NavProcessItem() updates current NavLayer. Basically we're hearing toward rebuilidng nav info from an id. (#787).

ae1866c4241eed391445d51cf5a993197665860c authored over 7 years ago

Nav: NavProcessItem() computes window-relative rectangle using own Window rather than NavWindow. Not sure what it may mean for child-flattened-nav (disabled). (#787)

97851f73764c1b0f77764ff850e59a31e025b722 authored over 7 years ago

Nav: SetFocusID() update NavWindow and NavRectRel just as we get them. Needed by upcoming commit, committing separately as I'm curious if it has any side-effect. (#787)

7d142622028108314d174af8025dacb368ef5605 authored over 7 years ago

Update README.md

633f60cdb2a33dbc396ee9bc8c6452b099d3b7b1 authored over 7 years ago

Merge branch 'master' into navigation

83416fa5da8cacf646e50114c395ac9c13545f66 authored over 7 years ago

ImDrawList: Fixed a bug in ChannelsMerge() leading to an extraneous draw call being created, which unexpectly led to more dramatic condition but to faulty draw command merging code. (#1172, #1368)

e32569dd5aa008448b10d9be11e5193502f5368b authored over 7 years ago

Merge pull request #1368 from ripieces/rendering-issue-1172

ImDrawList: Merging issue fix.

bebc49bc2aad946d36dab9f0bb4bfdb205ff7deb authored over 7 years ago

Rendering issue fix

Fixes ocornut/imgui#1172

7a8eb5bdc971d3f1b82ae8683a9df9b4c1437a78 authored over 7 years ago

Nav: Renaming a field + Comments.

d761825cfb92ed4d5ce8fa5abfc59f6c20d77023 authored over 7 years ago

Removed apparently unncessary code in InputFloatN() and InputInt().

ce7b04e8b97d451f4888168ec76f95bc35a5de09 authored over 7 years ago

Update README.md

251bc6c22ce886f36b779136ed652f7ac1ed1368 authored over 7 years ago

Update README.md

b498856c9d2c8270481e7e1ef25ed57142ce7ca3 authored over 7 years ago

Update README.md

dbab9b248abfe64bfa2a469de1c9357277b4043a authored over 7 years ago

Nav: ButtonBehavior() keep _displaying_ NavId item as howered when refocusing or moving window, which is consistent with IsItemHovered() and reduce noise/flicker (#787)

db5f1b79cdb31d50d302f7052a8f25102ecfef57 authored over 7 years ago

Reluctantly exposed GetActiveID(), GetHoveredID() in imgui_internal because the demo code will need it.

c42baf392a37e7621f473a16a60031b4a3a62022 authored over 7 years ago

Nav: Shallow tweaks.

53780a4fcc5344d0007eb49e9f231dc8954ec0c2 authored over 7 years ago

Nav: Internals: Renamed ImGuiButtonFlags_NoNavOverride to ImGuiButtonFlags_NoNavFocus + fixed a theorically missing test in ButtonBehavior() (#787)

b667d5a9e745bd79ac723da157602b51b9e2dee4 authored over 7 years ago

Exposed Scrollbar() in imgui_internal.h and removed a bool arg

f852b9a52aeff7978bc3d2c5b76d5ffeb57b0f4d authored over 7 years ago

Nav: Internals: Renamed SetActiveIDNoNav -> SetActiveID() and old SetActiveID() -> SetFocusID(), both functions needs to be called when both are desirabled. (#787)

May break code relying on imgui_internal.h, relying on nav and not calling ButtonBehavior().

03712192223b80bd86950738948157dc60531971 authored over 7 years ago

Internals: Moved SetNavID() and renamed casing to be consistent with stuff exposed in imgui_internal.h

8b095e483b093732b8a46c7b7d97feb3ca665fd2 authored over 7 years ago

Exposed Scrollbar() in imgui_internal.h and removed a bool arg

4be967823fb72c799f3b3d5f2204a2e287476af9 authored over 7 years ago

Internals: SetActiveID window cannot be NULL

48498b337de330fe91d1faa6b7fbcd154ea28b2f authored over 7 years ago

Nav: commiting shallow bits to reduce noise from working copy/upcoming commit.

4548bcb5c92ea88fd7c77e14cbc9ebde6b81bd14 authored over 7 years ago

Nav: Extract part of NavUpdate() into a saner NavUpdateWindowingTarget() (#787)

17519c313a4f4c01df62a1628f28f0571dec9b1f authored over 7 years ago

Nav: Made NavWindow always refresh from NavId so we can lazily retrieve the window for user functions that don't have it. This is not required by current commit but I'd rather test it earlier. Idea: eventually if we switch to 64-bit identifiers we could reserve e.g. 20 bits to store a simplified window identifier so we can always retrieve a window from an id. (#787)

b05b31e6905384c71dbdb223e1ca080cf42033b9 authored over 7 years ago

Nav: SetActiveId() uses SetActiveIDNoNav() to avoid duplicating logic. (#787)

f0d437dd9c73f62cfaa7a29e48c64181d79735a3 authored over 7 years ago

Nav: Extract part of NavUpdate() into a saner NavScrollToBringItemIntoView() (#787)

2047c58efbc204a8562773286ae2507b4b65b847 authored over 7 years ago

Nav: More consistently drawing a (thin) navigation rectangle hover filled frames such as tree nodes, collapsing header, menus. (#787)

7a14d7dfdcc045163e3a301b6dcf40df16dfb765 authored over 7 years ago

Merge branch 'master' into navigation

3833f1f7a2bfa71cd61ea08ebe1b4415669dcbbe authored over 7 years ago

Rnamed AlignFirstTextHeightToWidgets() to AlignTextToFramePadding(). Kept inline redirection function (will obsolete).

43b4a81b3e3a1895851457533830501bba212058 authored over 7 years ago

Links

578a588c1d85d6aa45bc9752a080cb54a5157b3c authored over 7 years ago

Links

4cfec4813e20871ffbb310490459182acd851d54 authored over 7 years ago

TreeNode: Added ImGuiTreeNodeFlags_FramePadding flag

c6e370a77a2dd03c9ce5ac1b9df2ccc399c1611a authored over 7 years ago

Nav: Renaming NavInitDefaultRequest -> NavInitRequest

69dd89535818c4413c9c0b9f13c0e23c6277c03a authored over 7 years ago

Nav: Moving code next to its peers

4d83078885e3568c4b32662a87d61518d0696279 authored over 7 years ago

Nav: Caching into g.NavAnyRequest to minimize hot path cost (and so we can add many more request sources)

d2975115cd43778994b7226d259896b7ae2f0956 authored over 7 years ago

Nav: Minor tweaks in NavProcessItem() used by ItemAdd()

d91b093be64350c73beb645e97abe57a38725678 authored over 7 years ago

Nav: Minor tweaks also toward removing processing from ItemAdd()

c3105919bacacabe207a7064ba2f636a20f136cf authored over 7 years ago

Internal: ItemAdd() minor shallow tweaks

d16309ca777414c1ea13dbef3d1051bd98a1223d authored over 7 years ago

Merge branch 'master' into navigation

# Conflicts:
# imgui.cpp
# imgui_internal.h

64ce83b9eded3c6d8605067fcb035d134db976b7 authored over 7 years ago

Internal: ItemAdd(), IsClippedEx(): removed unnecessary indirection for ID parameter

042153d2548c4d1861d6b41ded655a17f36809fd authored over 7 years ago

Removed extraneous calls to GetCurrentWindowRead() when we already have a ImGuiContext. Internal RenderXXX functions also don't need to write into the Accessed field at all.

acb6f12d2cb14ab359c64ff1a9fd42582371b174 authored over 7 years ago

Merge branch 'master' into navigation

6e1199c6034727ab4c385d588c616ce5ed1eb2c1 authored over 7 years ago

Comments (clarifying whether types are to be considered as flags or regular, non combinable enums)

335c8dd159701853bb34d6d5a6b04dc797fb8062 authored over 7 years ago

Nav: Shuffled code in ItemAdd() so that NavProcessItem() may have access to LastItemId (will be required by tabbing)

f451785c9efea3f26997aae0169d6db9189f166b authored over 7 years ago