commit bbd6d5d5b55363437dc2528b4bd23b7a00aba1e3
author omar <omarcornut@gmail.com> Wed Sep 27 00:20:09 2017 +0200
committer omar <omarcornut@gmail.com> Wed Sep 27 00:20:09 2017 +0200
tree dbadf7c596d97a41da5d384d3eb9a44ed26489a2
parent 3fe2ecfd4cd34367b505fba38941217a3cc89f1d

Combo: Cleaned up, removed unnecessary code (looks like this part went untouched for a long time!).

imgui.cpp

diff --git a/imgui.cpp b/imgui.cpp
index 5faff4f..2ac7d20 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -8632,7 +8632,10 @@
         return false;
 
     const float arrow_size = SmallSquareSize();
-    const bool hovered = IsHovered(frame_bb, id);
+
+    bool hovered, held;
+    bool pressed = ButtonBehavior(frame_bb, id, &hovered, &held);
+
     bool popup_open = IsPopupOpen(id);
 
     const ImRect value_bb(frame_bb.Min, frame_bb.Max - ImVec2(arrow_size, 0.0f));
@@ -8646,28 +8649,10 @@
     if (label_size.x > 0)
         RenderText(ImVec2(frame_bb.Max.x + style.ItemInnerSpacing.x, frame_bb.Min.y + style.FramePadding.y), label);
 
-    bool popup_toggled = false;
-    if (hovered)
+    if (pressed && !popup_open)
     {
-        SetHoveredID(id);
-        if (g.IO.MouseClicked[0])
-        {
-            ClearActiveID();
-            popup_toggled = true;
-        }
-    }
-    if (popup_toggled)
-    {
-        if (popup_open)
-        {
-            ClosePopup(id);
-        }
-        else
-        {
-            FocusWindow(window);
-            OpenPopupEx(id, false);
-        }
-        popup_open = !popup_open;
+        OpenPopupEx(id, false);
+        popup_open = true;
     }
 
     if (!popup_open)