oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

timebasedview: cache scroll value before scale change on ctrl zoom

Browse Source 
Fixes bug where scroll would be calculated incorrectly due to range limitation from scale change
This commit is contained in:
itsmattkc
2022-07-15 09:47:58 -07:00
parent a6d1ec99a8
commit 4b8febd10d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/timebased/timebasedview.cpp
+6 -2
View File
@@ -109,20 +109,24 @@ void TimeBasedView::ZoomIntoCursorPosition(QWheelEvent *event, double scale_mult
} }
if (!only_vertical) { if (!only_vertical) {
double old_scroll = horizontalScrollBar()->value();
double old_scale = GetScale(); double old_scale = GetScale();
emit ScaleChanged(old_scale * scale_multiplier); emit ScaleChanged(old_scale * scale_multiplier);
// Use GetScale so that if this value was clamped, we don't erroneously use an unclamped value // Use GetScale so that if this value was clamped, we don't erroneously use an unclamped value
int new_x_scroll = qRound(double(cursor_pos.x() + horizontalScrollBar()->value()) / old_scale * GetScale() - cursor_pos.x()); int new_x_scroll = qRound((cursor_pos.x() + old_scroll) / old_scale * GetScale() - cursor_pos.x());
horizontalScrollBar()->setValue(new_x_scroll); horizontalScrollBar()->setValue(new_x_scroll);
} }
if (!only_horizontal) { if (!only_horizontal) {
double old_y_scroll = verticalScrollBar()->value();
double old_y_scale = GetYScale(); double old_y_scale = GetYScale();
SetYScale(old_y_scale * scale_multiplier); SetYScale(old_y_scale * scale_multiplier);
// Use GetYScale so that if this value was clamped, we don't erroneously use an unclamped value // Use GetYScale so that if this value was clamped, we don't erroneously use an unclamped value
int new_y_scroll = qRound(double(cursor_pos.y() + verticalScrollBar()->value()) / old_y_scale * GetYScale() - cursor_pos.y()); int new_y_scroll = qRound((cursor_pos.y() + old_y_scroll) / old_y_scale * GetYScale() - cursor_pos.y());
verticalScrollBar()->setValue(new_y_scroll); verticalScrollBar()->setValue(new_y_scroll);
} }
} }