From 530f293c49c79e85391668c2ce68e5cc91974584 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Sat, 10 Aug 2019 22:06:51 +0200 Subject: [PATCH] Better way to handle auto scrolling. --- server/TracyView.cpp | 18 ++---------------- server/TracyView.hpp | 2 -- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/server/TracyView.cpp b/server/TracyView.cpp index b24ed0d2..3355ab88 100644 --- a/server/TracyView.cpp +++ b/server/TracyView.cpp @@ -5964,24 +5964,10 @@ void View::DrawMessages() } m_visibleMessages = msgcnt; - if( !filterActive ) + if( ImGui::GetScrollY() >= ImGui::GetScrollMaxY() ) { - const auto maxScroll = ImGui::GetScrollMaxY(); - if( maxScroll != 0 ) - { - const auto msgssize = msgs.size(); - if( m_prevMessages == msgssize && !m_messageFilterWasActive ) - { - m_messagesScrollBottom = ImGui::GetScrollY() == maxScroll; - } - else - { - m_prevMessages = msgssize; - if( m_messagesScrollBottom ) ImGui::SetScrollHereY(); - } - } + ImGui::SetScrollHereY( 1.f ); } - m_messageFilterWasActive = filterActive; ImGui::EndColumns(); ImGui::EndChild(); diff --git a/server/TracyView.hpp b/server/TracyView.hpp index f9fe45bb..0ca91d55 100644 --- a/server/TracyView.hpp +++ b/server/TracyView.hpp @@ -267,9 +267,7 @@ private: ZoneEvent* m_zoneHover = nullptr; int m_frameHover = -1; bool m_messagesScrollBottom; - size_t m_prevMessages = 0; ImGuiTextFilter m_messageFilter; - bool m_messageFilterWasActive = false; int m_visibleMessages = 0; bool m_disconnectIssued = false;