Scarfski/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2026-10-06 17:05:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1286 from slomp/slomp/touchpad-zoom-fix

Browse Source 
Have Touchpad gestures either scroll or zoom the timeline, but not both together
This commit is contained in:
Bartosz Taudul
2026-02-28 22:55:25 +01:00
committed by GitHub
parent d6620568e5 20932eae88
commit aa30c611a8
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
profiler/src/profiler/TracyView_Timeline.cpp
View File

@@ -87,8 +87,8 @@ void View::HandleTimelineMouse( int64_t timespan, const ImVec2& wpos, float w )
}
}
const auto hwheel_delta = io.MouseWheelH * 100.f * m_horizontalScrollMultiplier;
if( IsMouseDragging( 1 ) || hwheel_delta != 0 )
const bool wheel_scroll = abs( io.MouseWheelH ) > abs( io.MouseWheel );
if( IsMouseDragging( 1 ) || wheel_scroll )
{
m_viewMode = ViewMode::Paused;
m_viewModeHeuristicTry = false;
@@ -96,6 +96,7 @@ void View::HandleTimelineMouse( int64_t timespan, const ImVec2& wpos, float w )
if( !m_playback.pause && m_playback.sync ) m_playback.pause = true;
const auto delta = GetMouseDragDelta( 1 );
m_yDelta = delta.y;
const auto hwheel_delta = io.MouseWheelH * 50.f * m_horizontalScrollMultiplier;
const auto dpx = int64_t( (delta.x * nspx) + (hwheel_delta * nspx));
if( dpx != 0 )
{
@@ -118,9 +119,10 @@ void View::HandleTimelineMouse( int64_t timespan, const ImVec2& wpos, float w )
}
}
const auto wheel = io.MouseWheel;
if( wheel != 0 )
const bool wheel_zoom = abs( io.MouseWheel ) > abs( io.MouseWheelH );
if( wheel_zoom )
{
const auto wheel = io.MouseWheel;
if( m_viewMode == ViewMode::LastFrames ) m_viewMode = ViewMode::LastRange;
const double mouse = io.MousePos.x - wpos.x;
const auto p = mouse / w;