Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-22 20:07:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Internals: reduced duplicate code in CalcNextScrollFromScrollTargetAndClamp() by looping through axiees.

Browse Source
This commit is contained in:
ocornut 2022-12-06 18:34:45 +01:00
parent 24b873a740
commit 820b1e651a
1 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
imgui.cpp
View File

@ -9577,38 +9577,24 @@ static float CalcScrollEdgeSnap(float target, float snap_min, float snap_max, fl
static ImVec2 CalcNextScrollFromScrollTargetAndClamp(ImGuiWindow* window) static ImVec2 CalcNextScrollFromScrollTargetAndClamp(ImGuiWindow* window)
{ {
ImVec2 scroll = window->Scroll; ImVec2 scroll = window->Scroll;
if (window->ScrollTarget.x < FLT_MAX) ImVec2 decoration_size(window->ScrollbarSizes.x, window->TitleBarHeight() + window->MenuBarHeight() + window->ScrollbarSizes.y);
for (int axis = 0; axis < 2; axis++)
{ {
float decoration_total_width = window->ScrollbarSizes.x; if (window->ScrollTarget[axis] < FLT_MAX)
float center_x_ratio = window->ScrollTargetCenterRatio.x;
float scroll_target_x = window->ScrollTarget.x;
if (window->ScrollTargetEdgeSnapDist.x > 0.0f)
{ {
float snap_x_min = 0.0f; float center_ratio = window->ScrollTargetCenterRatio[axis];
float snap_x_max = window->ScrollMax.x + window->SizeFull.x - decoration_total_width; float scroll_target = window->ScrollTarget[axis];
scroll_target_x = CalcScrollEdgeSnap(scroll_target_x, snap_x_min, snap_x_max, window->ScrollTargetEdgeSnapDist.x, center_x_ratio); if (window->ScrollTargetEdgeSnapDist[axis] > 0.0f)
}
scroll.x = scroll_target_x - center_x_ratio * (window->SizeFull.x - decoration_total_width);
}
if (window->ScrollTarget.y < FLT_MAX)
{ {
float decoration_total_height = window->TitleBarHeight() + window->MenuBarHeight() + window->ScrollbarSizes.y; float snap_min = 0.0f;
float center_y_ratio = window->ScrollTargetCenterRatio.y; float snap_max = window->ScrollMax[axis] + window->SizeFull[axis] - decoration_size[axis];
float scroll_target_y = window->ScrollTarget.y; scroll_target = CalcScrollEdgeSnap(scroll_target, snap_min, snap_max, window->ScrollTargetEdgeSnapDist[axis], center_ratio);
if (window->ScrollTargetEdgeSnapDist.y > 0.0f)
{
float snap_y_min = 0.0f;
float snap_y_max = window->ScrollMax.y + window->SizeFull.y - decoration_total_height;
scroll_target_y = CalcScrollEdgeSnap(scroll_target_y, snap_y_min, snap_y_max, window->ScrollTargetEdgeSnapDist.y, center_y_ratio);
} }
scroll.y = scroll_target_y - center_y_ratio * (window->SizeFull.y - decoration_total_height); scroll[axis] = scroll_target - center_ratio * (window->SizeFull[axis] - decoration_size[axis]);
} }
scroll.x = IM_FLOOR(ImMax(scroll.x, 0.0f)); scroll[axis] = IM_FLOOR(ImMax(scroll[axis], 0.0f));
scroll.y = IM_FLOOR(ImMax(scroll.y, 0.0f));
if (!window->Collapsed && !window->SkipItems) if (!window->Collapsed && !window->SkipItems)
{ scroll[axis] = ImMin(scroll[axis], window->ScrollMax[axis]);
scroll.x = ImMin(scroll.x, window->ScrollMax.x);
scroll.y = ImMin(scroll.y, window->ScrollMax.y);
} }
return scroll; return scroll;
} }