Link/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00
Code Issues Projects Wiki Activity

Stop zoom-range-selection when zooming to range.

Browse Source 
This also disables zoom range selection when middle click is used to
zoom view to a selected zone.
This commit is contained in:
Bartosz Taudul 2018-07-29 20:17:35 +02:00
parent b4f4fcfde9
commit 310203101f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/TracyView.cpp
View File

@ -774,9 +774,9 @@ void View::HandleZoneViewMouse( int64_t timespan, const ImVec2& wpos, float w, d
} }
else if( m_highlightZoom.active ) else if( m_highlightZoom.active )
{ {
m_highlightZoom.active = false;
const auto s = std::min( m_highlightZoom.start, m_highlightZoom.end ); const auto s = std::min( m_highlightZoom.start, m_highlightZoom.end );
const auto e = std::max( m_highlightZoom.start, m_highlightZoom.end ); const auto e = std::max( m_highlightZoom.start, m_highlightZoom.end );
// ZoomToRange disables m_highlightZoom.active
ZoomToRange( s, e ); ZoomToRange( s, e );
} }
@ -6076,6 +6076,7 @@ void View::ZoomToZone( const GpuEvent& ev )
void View::ZoomToRange( int64_t start, int64_t end ) void View::ZoomToRange( int64_t start, int64_t end )
{ {
m_pause = true; m_pause = true;
m_highlightZoom.active = false;
m_zoomAnim.active = true; m_zoomAnim.active = true;
m_zoomAnim.start0 = m_zvStart; m_zoomAnim.start0 = m_zvStart;
m_zoomAnim.start1 = start; m_zoomAnim.start1 = start;