From e36b41cbd0dc69c2bb4d6c3d1eb0d5fc3884652c Mon Sep 17 00:00:00 2001
From: omar <omarcornut@gmail.com>
Date: Mon, 7 Aug 2017 21:53:57 +0800
Subject: [PATCH] Fixed Y scroll aiming when Horizontal Scrollbar is enabled
 (#665). Tweak log demo.

---
 imgui.cpp      | 2 +-
 imgui_demo.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/imgui.cpp b/imgui.cpp
index 694227e1..7d30e788 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -4200,7 +4200,7 @@ bool ImGui::Begin(const char* name, bool* p_open, const ImVec2& size_on_first_us
         if (window->ScrollTarget.y < FLT_MAX)
         {
             float center_ratio = window->ScrollTargetCenterRatio.y;
-            window->Scroll.y = window->ScrollTarget.y - ((1.0f - center_ratio) * (window->TitleBarHeight() + window->MenuBarHeight())) - (center_ratio * window->SizeFull.y);
+            window->Scroll.y = window->ScrollTarget.y - ((1.0f - center_ratio) * (window->TitleBarHeight() + window->MenuBarHeight())) - (center_ratio * (window->SizeFull.y - window->ScrollbarSizes.y));
             window->ScrollTarget.y = FLT_MAX;
         }
         window->Scroll = ImMax(window->Scroll, ImVec2(0.0f, 0.0f));
diff --git a/imgui_demo.cpp b/imgui_demo.cpp
index 72de7525..18697277 100644
--- a/imgui_demo.cpp
+++ b/imgui_demo.cpp
@@ -2464,10 +2464,10 @@ static void ShowExampleAppLog(bool* p_open)
 {
     static ExampleAppLog log;
 
-    // Demo fill
+    // Demo: add random items (unless Ctrl is held)
     static float last_time = -1.0f;
     float time = ImGui::GetTime();
-    if (time - last_time >= 0.3f)
+    if (time - last_time >= 0.20f && !ImGui::GetIO().KeyCtrl)
     {
         const char* random_words[] = { "system", "info", "warning", "error", "fatal", "notice", "log" };
         log.AddLog("[%s] Hello, time is %.1f, rand() %d\n", random_words[rand() % IM_ARRAYSIZE(random_words)], time, (int)rand());