Merge branch 'master' into navigation

# Conflicts:
#	imgui.cpp
#	imgui_internal.h

imgui.cpp

@@ -9538,7 +9538,7 @@ bool ImGui::BeginCombo(const char* label, const char* preview_value, float popup
             if (window->DC.NavLayerCurrent == 0) 
                 window->NavLastId = id;
             FocusWindow(window);
-            OpenPopup(label);
+            OpenPopupEx(id, false);
         }
         popup_open = !popup_open;
     }
@@ -10006,12 +10006,13 @@ bool ImGui::BeginMenu(const char* label, bool enabled)
         want_close = true;
         want_open = menu_is_open = false;
     }
-    else if (pressed || (hovered && menuset_is_open && !menu_is_open)) // Menu bar: click to open a first menu, then hover to open others
+    else if (pressed || (hovered && menuset_is_open && !menu_is_open)) // Menu bar: first click to open, then hover to open others
+    {
         want_open = true;
+    }
     else if (g.NavId == id && g.NavMoveRequest && g.NavMoveDir == ImGuiDir_Down) // Menu bar: Nav-Down to open
     {
         g.NavMoveRequest = false;
-        want_open = true;
     }
 
     if (!enabled) // explicitly close if an open menu becomes disabled, facilitate users code a lot in pattern such as 'if (BeginMenu("options", has_object)) { ..use object.. }'

imgui.h

@@ -205,9 +205,9 @@ namespace ImGui
     IMGUI_API float         CalcItemWidth();                                                    // width of item given pushed settings and current cursor position
     IMGUI_API void          PushTextWrapPos(float wrap_pos_x = 0.0f);                           // word-wrapping for Text*() commands. < 0.0f: no wrapping; 0.0f: wrap to end of window (or column); > 0.0f: wrap at 'wrap_pos_x' position in window local space
     IMGUI_API void          PopTextWrapPos();
-    IMGUI_API void          PushAllowKeyboardFocus(bool v);                                     // allow focusing using TAB/Shift-TAB, enabled by default but you can disable it for certain widgets
+    IMGUI_API void          PushAllowKeyboardFocus(bool allow_keyboard_focus);                  // allow focusing using TAB/Shift-TAB, enabled by default but you can disable it for certain widgets
     IMGUI_API void          PopAllowKeyboardFocus();
-    IMGUI_API void          PushButtonRepeat(bool repeat);                                      // in 'repeat' mode, Button*() functions return repeated true in a typematic manner (uses io.KeyRepeatDelay/io.KeyRepeatRate for now). Note that you can call IsItemActive() after any Button() to tell if the button is held in the current frame.
+    IMGUI_API void          PushButtonRepeat(bool repeat);                                      // in 'repeat' mode, Button*() functions return repeated true in a typematic manner (using io.KeyRepeatDelay/io.KeyRepeatRate setting). Note that you can call IsItemActive() after any Button() to tell if the button is held in the current frame.
     IMGUI_API void          PopButtonRepeat();
 
     // Cursor / Layout

imgui_internal.h

@@ -626,10 +626,10 @@ struct ImGuiContext
 // Transient per-window flags, reset at the beginning of the frame. For child window, inherited from parent on first Begin().
 enum ImGuiItemFlags_
 {
-    ImGuiItemFlags_AllowKeyboardFocus       = 1 << 0,  // [true]
-    ImGuiItemFlags_AllowNavDefaultFocus     = 1 << 1,  // [true]
-    ImGuiItemFlags_ButtonRepeat             = 1 << 2,  // [false]	// Button() can be held will a repeat behavior
-    ImGuiItemFlags_SelectableDontClosePopup = 1 << 3,  // [false]	// MenuItem/Selectable() automatically closes owner Popup window
+    ImGuiItemFlags_AllowKeyboardFocus       = 1 << 0,  // true
+    ImGuiItemFlags_ButtonRepeat             = 1 << 1,  // false    // Button() will return true multiple times based on io.KeyRepeatDelay and io.KeyRepeatRate settings.
+    ImGuiItemFlags_AllowNavDefaultFocus     = 1 << 1,  // true
+    ImGuiItemFlags_SelectableDontClosePopup = 1 << 3,  // false    // MenuItem/Selectable() automatically closes current Popup window
     ImGuiItemFlags_Default_                 = ImGuiItemFlags_AllowKeyboardFocus|ImGuiItemFlags_AllowNavDefaultFocus
 };