mirror of
https://github.com/ocornut/imgui.git
synced 2026-01-11 00:04:24 +00:00
Merge branch 'master' into docking
# Conflicts: # backends/imgui_impl_vulkan.cpp
This commit is contained in:
commit
772cbfd014
11 changed files with 86 additions and 45 deletions
|
|
@ -1,4 +1,4 @@
|
|||
// dear imgui, v1.92.5
|
||||
// dear imgui, v1.92.6 WIP
|
||||
// (widgets code)
|
||||
|
||||
/*
|
||||
|
|
@ -1043,6 +1043,8 @@ bool ImGui::ScrollbarEx(const ImRect& bb_frame, ImGuiID id, ImGuiAxis axis, ImS6
|
|||
|
||||
// V denote the main, longer axis of the scrollbar (= height for a vertical scrollbar)
|
||||
const float scrollbar_size_v = (axis == ImGuiAxis_X) ? bb.GetWidth() : bb.GetHeight();
|
||||
if (scrollbar_size_v < 1.0f)
|
||||
return false;
|
||||
|
||||
// Calculate the height of our grabbable box. It generally represent the amount visible (vs the total scrollable amount)
|
||||
// But we maintain a minimum size in pixel to allow for the user to still aim inside.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue