Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-15 01:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

ButtonBehavior: Tidying up.

Browse Source
This commit is contained in:
omar 2017-09-28 19:47:45 +02:00
parent 4b4e455c40
commit dd0855de5c
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
imgui.cpp
View File

@ -6589,25 +6589,30 @@ bool ImGui::ButtonBehavior(const ImRect& bb, ImGuiID id, bool* out_hovered, bool
} }
bool held = false; bool held = false;
if (g.ActiveId == id && g.ActiveIdSource == ImGuiInputSource_Mouse) if (g.ActiveId == id)
{ {
if (g.IO.MouseDown[0]) if (g.ActiveIdSource == ImGuiInputSource_Mouse)
{ {
held = true; if (g.IO.MouseDown[0])
{
held = true;
}
else
{
if (hovered && (flags & ImGuiButtonFlags_PressedOnClickRelease))
if (!((flags & ImGuiButtonFlags_Repeat) && g.IO.MouseDownDurationPrev[0] >= g.IO.KeyRepeatDelay)) // Repeat mode trumps <on release>
pressed = true;
ClearActiveID();
}
if (!(flags & ImGuiButtonFlags_NoNavOverride))
g.NavDisableHighlight = true;
} }
else else if (g.ActiveIdSource == ImGuiInputSource_Nav)
{ {
if (hovered && (flags & ImGuiButtonFlags_PressedOnClickRelease)) if (!IsNavInputDown(ImGuiNavInput_PadActivate))
if (!((flags & ImGuiButtonFlags_Repeat) && g.IO.MouseDownDurationPrev[0] >= g.IO.KeyRepeatDelay)) // Repeat mode trumps <on release> ClearActiveID();
pressed = true;
ClearActiveID();
} }
if (!(flags & ImGuiButtonFlags_NoNavOverride))
g.NavDisableHighlight = true;
} }
if (g.ActiveId == id && g.ActiveIdSource == ImGuiInputSource_Nav)
if (!IsNavInputDown(ImGuiNavInput_PadActivate))
ClearActiveID();
// AllowOverlap mode (rarely used) requires previous frame HoveredId to be null or to match. This allows using patterns where a later submitted widget overlaps a previous one. // AllowOverlap mode (rarely used) requires previous frame HoveredId to be null or to match. This allows using patterns where a later submitted widget overlaps a previous one.
if (hovered && (flags & ImGuiButtonFlags_AllowOverlapMode) && (g.HoveredIdPreviousFrame != id && g.HoveredIdPreviousFrame != 0)) if (hovered && (flags & ImGuiButtonFlags_AllowOverlapMode) && (g.HoveredIdPreviousFrame != id && g.HoveredIdPreviousFrame != 0))