|
@@ -1657,10 +1657,8 @@ enum ImGuiButtonFlags_
|
|
|
ImGuiButtonFlags_MouseButtonLeft = 1 << 0, // React on left mouse button (default)
|
|
|
ImGuiButtonFlags_MouseButtonRight = 1 << 1, // React on right mouse button
|
|
|
ImGuiButtonFlags_MouseButtonMiddle = 1 << 2, // React on center mouse button
|
|
|
-
|
|
|
- // [Internal]
|
|
|
- ImGuiButtonFlags_MouseButtonMask_ = ImGuiButtonFlags_MouseButtonLeft | ImGuiButtonFlags_MouseButtonRight | ImGuiButtonFlags_MouseButtonMiddle,
|
|
|
- ImGuiButtonFlags_MouseButtonDefault_ = ImGuiButtonFlags_MouseButtonLeft,
|
|
|
+ ImGuiButtonFlags_MouseButtonMask_ = ImGuiButtonFlags_MouseButtonLeft | ImGuiButtonFlags_MouseButtonRight | ImGuiButtonFlags_MouseButtonMiddle, // [Internal]
|
|
|
+ //ImGuiButtonFlags_MouseButtonDefault_ = ImGuiButtonFlags_MouseButtonLeft,
|
|
|
};
|
|
|
|
|
|
// Flags for ColorEdit3() / ColorEdit4() / ColorPicker3() / ColorPicker4() / ColorButton()
|
|
@@ -3265,7 +3263,7 @@ namespace ImGui
|
|
|
static inline void PopAllowKeyboardFocus() { PopTabStop(); }
|
|
|
// OBSOLETED in 1.89 (from August 2022)
|
|
|
IMGUI_API bool ImageButton(ImTextureID user_texture_id, const ImVec2& size, const ImVec2& uv0 = ImVec2(0, 0), const ImVec2& uv1 = ImVec2(1, 1), int frame_padding = -1, const ImVec4& bg_col = ImVec4(0, 0, 0, 0), const ImVec4& tint_col = ImVec4(1, 1, 1, 1)); // Use new ImageButton() signature (explicit item id, regular FramePadding)
|
|
|
- // OBSOLETED in 1.87 (from February 2022)
|
|
|
+ // OBSOLETED in 1.87 (from February 2022 but more formally obsoleted April 2024)
|
|
|
IMGUI_API ImGuiKey GetKeyIndex(ImGuiKey key); // Map ImGuiKey_* values into legacy native key index. == io.KeyMap[key]. When using a 1.87+ backend using io.AddKeyEvent(), calling GetKeyIndex() with ANY ImGuiKey_XXXX values will return the same value!
|
|
|
//static inline ImGuiKey GetKeyIndex(ImGuiKey key) { IM_ASSERT(key >= ImGuiKey_NamedKey_BEGIN && key < ImGuiKey_NamedKey_END); return key; }
|
|
|
|