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 |
|
omar
|
d96b6ecf88
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_demo.cpp
|
7 years ago |
|
omar
|
03b76bf05b
|
Begin: Marked 5 parameters version of Begin() as obsolete. Now waiting for a riot to happen!
|
7 years ago |
|
omar
|
78a85ba3fe
|
Begin: Work toward obsoleting the 5-arguments Begin() overload. Internal BeginEx() becomes the normal public Begin() again! (4)
|
7 years ago |
|
omar
|
2739b6ebcd
|
Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed bg_alpha from internal BeginEx(). (3)
|
7 years ago |
|
omar
|
4aa9d2089d
|
Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed size_on_first_use from internal BeginEx(). (2)
|
7 years ago |
|
omar
|
55d873875e
|
Begin: Work toward obsoleting the 5-arguments Begin() overload. (1)
|
7 years ago |
|
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.
|
7 years ago |
|
omar
|
c76f014292
|
Fix IsItemHovered() issue on child by temporarily reverting 344d48be31. This is not the ideal solution. (Fix #1370)
|
7 years ago |
|
omar
|
af565ea828
|
Nav: InputTextMultiline: Fixed navigation/selection. Disabled selecting all when activating a multi-line text editor. (#787)
|
7 years ago |
|
omar
|
7ea52ac1e4
|
Nav: InputTextMultiline: Fixed navigation/selection. Disabled selecting all when activating a multi-line text editor. (#787)
|
7 years ago |
|
omar
|
82a27fd3aa
|
Nav: InputText: Fixed using Up/Down history callback feature when Nav is enabled (#787)
|
7 years ago |
|
omar
|
b70c2fa887
|
Nav: Internals: Moved some internal code to namespace, comments
|
7 years ago |
|
omar
|
ae1866c424
|
Nav: NavProcessItem() updates current NavLayer. Basically we're hearing toward rebuilidng nav info from an id. (#787).
|
7 years ago |
|
omar
|
97851f7376
|
Nav: NavProcessItem() computes window-relative rectangle using own Window rather than NavWindow. Not sure what it may mean for child-flattened-nav (disabled). (#787)
|
7 years ago |
|
omar
|
7d14262202
|
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)
|
7 years ago |
omar
|
633f60cdb2
|
Update README.md
|
7 years ago |
|
omar
|
83416fa5da
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
e32569dd5a
|
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)
|
7 years ago |
|
omar
|
bebc49bc2a
|
Merge pull request #1368 from ripieces/rendering-issue-1172
ImDrawList: Merging issue fix.
|
7 years ago |
Dominik Tugend
|
7a8eb5bdc9
|
Rendering issue fix
Fixes ocornut/imgui#1172
|
7 years ago |
|
omar
|
d761825cfb
|
Nav: Renaming a field + Comments.
|
7 years ago |
|
omar
|
ce7b04e8b9
|
Removed apparently unncessary code in InputFloatN() and InputInt().
|
7 years ago |
|
omar
|
251bc6c22c
|
Update README.md
|
7 years ago |
|
omar
|
b498856c9d
|
Update README.md
|
7 years ago |
|
omar
|
dbab9b248a
|
Update README.md
|
7 years ago |
|
omar
|
db5f1b79cd
|
Nav: ButtonBehavior() keep _displaying_ NavId item as howered when refocusing or moving window, which is consistent with IsItemHovered() and reduce noise/flicker (#787)
|
7 years ago |
|
omar
|
c42baf392a
|
Reluctantly exposed GetActiveID(), GetHoveredID() in imgui_internal because the demo code will need it.
|
7 years ago |
|
omar
|
53780a4fcc
|
Nav: Shallow tweaks.
|
7 years ago |
|
omar
|
f852b9a52a
|
Exposed Scrollbar() in imgui_internal.h and removed a bool arg
|
7 years ago |
|
omar
|
b667d5a9e7
|
Nav: Internals: Renamed ImGuiButtonFlags_NoNavOverride to ImGuiButtonFlags_NoNavFocus + fixed a theorically missing test in ButtonBehavior() (#787)
|
7 years ago |
|
omar
|
0371219222
|
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().
|
7 years ago |
|
omar
|
8b095e483b
|
Internals: Moved SetNavID() and renamed casing to be consistent with stuff exposed in imgui_internal.h
|
7 years ago |
|
omar
|
4be967823f
|
Exposed Scrollbar() in imgui_internal.h and removed a bool arg
|
7 years ago |
|
omar
|
48498b337d
|
Internals: SetActiveID window cannot be NULL
|
7 years ago |
|
omar
|
4548bcb5c9
|
Nav: commiting shallow bits to reduce noise from working copy/upcoming commit.
|
7 years ago |
|
omar
|
17519c313a
|
Nav: Extract part of NavUpdate() into a saner NavUpdateWindowingTarget() (#787)
|
7 years ago |
|
omar
|
b05b31e690
|
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)
|
7 years ago |