|
|
@ -2733,13 +2733,11 @@ void ImGui::NewFrame() |
|
|
|
if (g.HoveredWindow && g.IO.MouseWheel != 0.0f && !g.HoveredWindow->Collapsed) |
|
|
|
if (g.HoveredWindow && g.IO.MouseWheel != 0.0f && !g.HoveredWindow->Collapsed) |
|
|
|
{ |
|
|
|
{ |
|
|
|
ImGuiWindow* window = g.HoveredWindow; |
|
|
|
ImGuiWindow* window = g.HoveredWindow; |
|
|
|
if (g.IO.KeyCtrl) |
|
|
|
if (g.IO.KeyCtrl && g.IO.FontAllowUserScaling) |
|
|
|
{ |
|
|
|
|
|
|
|
if (g.IO.FontAllowUserScaling) |
|
|
|
|
|
|
|
{ |
|
|
|
{ |
|
|
|
// Zoom / Scale window
|
|
|
|
// Zoom / Scale window
|
|
|
|
float new_font_scale = ImClamp(window->FontWindowScale + g.IO.MouseWheel * 0.10f, 0.50f, 2.50f); |
|
|
|
const float new_font_scale = ImClamp(window->FontWindowScale + g.IO.MouseWheel * 0.10f, 0.50f, 2.50f); |
|
|
|
float scale = new_font_scale / window->FontWindowScale; |
|
|
|
const float scale = new_font_scale / window->FontWindowScale; |
|
|
|
window->FontWindowScale = new_font_scale; |
|
|
|
window->FontWindowScale = new_font_scale; |
|
|
|
|
|
|
|
|
|
|
|
const ImVec2 offset = window->Size * (1.0f - scale) * (g.IO.MousePos - window->Pos) / window->Size; |
|
|
|
const ImVec2 offset = window->Size * (1.0f - scale) * (g.IO.MousePos - window->Pos) / window->Size; |
|
|
@ -2748,8 +2746,7 @@ void ImGui::NewFrame() |
|
|
|
window->Size *= scale; |
|
|
|
window->Size *= scale; |
|
|
|
window->SizeFull *= scale; |
|
|
|
window->SizeFull *= scale; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
else if (!g.IO.KeyCtrl && !(window->Flags & ImGuiWindowFlags_NoScrollWithMouse)) |
|
|
|
else if (!(window->Flags & ImGuiWindowFlags_NoScrollWithMouse)) |
|
|
|
|
|
|
|
{ |
|
|
|
{ |
|
|
|
// Scroll
|
|
|
|
// Scroll
|
|
|
|
const int scroll_lines = (window->Flags & ImGuiWindowFlags_ComboBox) ? 3 : 5; |
|
|
|
const int scroll_lines = (window->Flags & ImGuiWindowFlags_ComboBox) ? 3 : 5; |
|
|
|