|
@@ -1412,7 +1412,8 @@ struct ImGuiWindow
|
|
ImVec2 SizeContents; // Size of contents (== extents reach of the drawing cursor) from previous frame
|
|
ImVec2 SizeContents; // Size of contents (== extents reach of the drawing cursor) from previous frame
|
|
ImGuiID MoveID; // == window->GetID("#MOVE")
|
|
ImGuiID MoveID; // == window->GetID("#MOVE")
|
|
float ScrollY;
|
|
float ScrollY;
|
|
- float ScrollTargetCenterY; // position which we aim to center on
|
|
|
|
|
|
+ float ScrollTargetAbsY; // target scroll position. stored as cursor position with scrolling canceled out, so the highest point is always 0.0f. (-1.0f for no change)
|
|
|
|
+ float ScrollTargetCenterRatioY; // 0.0f = scroll so that target position is at top, 0.5f = scroll so that target position is centered
|
|
bool ScrollbarY;
|
|
bool ScrollbarY;
|
|
bool Active; // Set to true on Begin()
|
|
bool Active; // Set to true on Begin()
|
|
bool WasActive;
|
|
bool WasActive;
|
|
@@ -1778,7 +1779,8 @@ ImGuiWindow::ImGuiWindow(const char* name)
|
|
Size = SizeFull = ImVec2(0.0f, 0.0f);
|
|
Size = SizeFull = ImVec2(0.0f, 0.0f);
|
|
SizeContents = ImVec2(0.0f, 0.0f);
|
|
SizeContents = ImVec2(0.0f, 0.0f);
|
|
ScrollY = 0.0f;
|
|
ScrollY = 0.0f;
|
|
- ScrollTargetCenterY = -1.0f;
|
|
|
|
|
|
+ ScrollTargetAbsY = -1.0f;
|
|
|
|
+ ScrollTargetCenterRatioY = 0.5f;
|
|
ScrollbarY = false;
|
|
ScrollbarY = false;
|
|
Active = WasActive = false;
|
|
Active = WasActive = false;
|
|
Accessed = false;
|
|
Accessed = false;
|
|
@@ -3836,10 +3838,11 @@ bool ImGui::Begin(const char* name, bool* p_opened, const ImVec2& size_on_first_
|
|
window->FocusIdxAllRequestNext = window->FocusIdxTabRequestNext = IM_INT_MAX;
|
|
window->FocusIdxAllRequestNext = window->FocusIdxTabRequestNext = IM_INT_MAX;
|
|
|
|
|
|
// Apply scrolling
|
|
// Apply scrolling
|
|
- if (window->ScrollTargetCenterY >= 0.0f)
|
|
|
|
|
|
+ if (window->ScrollTargetAbsY >= 0.0f)
|
|
{
|
|
{
|
|
- window->ScrollY = window->ScrollTargetCenterY - (window->Pos.y + (window->SizeFull.y + window->TitleBarHeight() + window->WindowPadding().y) * 0.5f);
|
|
|
|
- window->ScrollTargetCenterY = -1.0f;
|
|
|
|
|
|
+ float center_ratio_y = window->ScrollTargetCenterRatioY;
|
|
|
|
+ window->ScrollY = window->ScrollTargetAbsY - (window->Pos.y + (1.0f - center_ratio_y) * window->TitleBarHeight() + center_ratio_y * window->SizeFull.y);
|
|
|
|
+ window->ScrollTargetAbsY = -1.0f;
|
|
}
|
|
}
|
|
window->ScrollY = ImMax(window->ScrollY, 0.0f);
|
|
window->ScrollY = ImMax(window->ScrollY, 0.0f);
|
|
if (!window->Collapsed && !window->SkipItems)
|
|
if (!window->Collapsed && !window->SkipItems)
|
|
@@ -4800,10 +4803,13 @@ float ImGui::GetScrollMaxY()
|
|
return window->SizeContents.y - window->SizeFull.y;
|
|
return window->SizeContents.y - window->SizeFull.y;
|
|
}
|
|
}
|
|
|
|
|
|
-void ImGui::SetScrollPosHere()
|
|
|
|
|
|
+void ImGui::SetScrollPosHere(float center_y_ratio)
|
|
{
|
|
{
|
|
|
|
+ // We store a target position so centering can occur on the next frame when we are guaranteed to have a known window size
|
|
|
|
+ IM_ASSERT(center_y_ratio >= 0.0f && center_y_ratio <= 1.0f);
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
- window->ScrollTargetCenterY = (float)(int)(window->DC.CursorPos.y + window->ScrollY - window->DC.PrevLineHeight * 0.5f);
|
|
|
|
|
|
+ window->ScrollTargetAbsY = (float)(int)(window->ScrollY + window->DC.CursorPosPrevLine.y + (window->DC.PrevLineHeight) * center_y_ratio);
|
|
|
|
+ window->ScrollTargetCenterRatioY = center_y_ratio;
|
|
}
|
|
}
|
|
|
|
|
|
void ImGui::SetKeyboardFocusHere(int offset)
|
|
void ImGui::SetKeyboardFocusHere(int offset)
|