From 37a4478127aaf67b654fab86324998908e1fd9b9 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Fri, 22 Apr 2022 22:38:05 +0200 Subject: [PATCH] Fix horizontal scroll of main window. Horizontal mouse scroll (or touchpad action) should map to navigation within the trace. While this was true in most cases, there was an edge case, when the top buttons row couldn't be entirely displayed, e.g. due to the window being resized too small, or due to set zoom level. This change disables scroll action on the main window, which fixes the issue. --- server/TracyView.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/TracyView.cpp b/server/TracyView.cpp index e9b0eaae..4c6b42ce 100644 --- a/server/TracyView.cpp +++ b/server/TracyView.cpp @@ -818,7 +818,7 @@ bool View::DrawImpl() ImGui::SetNextWindowPos( viewport->Pos ); ImGui::SetNextWindowSize( ImVec2( m_rootWidth, m_rootHeight ) ); ImGui::SetNextWindowViewport( viewport->ID ); - ImGui::Begin( "Timeline view###Profiler", nullptr, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDocking | ImGuiWindowFlags_NoNavFocus ); + ImGui::Begin( "Timeline view###Profiler", nullptr, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse | ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDocking | ImGuiWindowFlags_NoNavFocus ); style.WindowRounding = wrPrev; style.WindowBorderSize = wbsPrev;