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

prioritize dragging markers over workarea

Browse Source
This commit is contained in:
itsmattkc
2022-11-18 10:35:51 -08:00
parent b33260dce8
commit eae02ac28b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/timeruler/seekablewidget.cpp
+3 -3
View File
@@ -181,6 +181,8 @@ void SeekableWidget::mousePressEvent(QMouseEvent *event)
return;
} else if (event->modifiers() & Qt::ControlModifier) {
selection_manager_.RubberBandStart(event);
} else if (marker_editing_enabled_ && (initial = selection_manager_.MousePress(event))) {
selection_manager_.DragStart(initial, event);
} else if (resize_item_) {
// Handle selection, even though we won't be using it for dragging
if (!(event->modifiers() & Qt::ShiftModifier)) {
@@ -191,8 +193,6 @@ void SeekableWidget::mousePressEvent(QMouseEvent *event)
}
dragging_ = true;
resize_start_ = mapToScene(event->pos());
} else if (marker_editing_enabled_ && (initial = selection_manager_.MousePress(event))) {
selection_manager_.DragStart(initial, event);
} else if (!selection_manager_.GetObjectAtPoint(event->pos()) && event->button() == Qt::LeftButton) {
SeekToScenePoint(mapToScene(event->pos()).x());
dragging_ = true;
@@ -219,7 +219,7 @@ void SeekableWidget::mouseMoveEvent(QMouseEvent *event)
}
} else {
// Look for resize points
if (FindResizeHandle(event)) {
if (!selection_manager_.GetObjectAtPoint(event->pos()) && FindResizeHandle(event)) {
setCursor(Qt::SizeHorCursor);
} else {
unsetCursor();
app/widget/timeruler/timeruler.cpp
+1 -1
View File
@@ -102,8 +102,8 @@ void TimeRuler::drawForeground(QPainter *p, const QRectF &rect)
// Draw timeline points if connected
int marker_height = TimelineMarker::GetMarkerHeight(p->fontMetrics());
DrawMarkers(p, marker_height);
DrawWorkArea(p);
DrawMarkers(p, marker_height);
double width_of_frame = timebase_dbl() * GetScale();
double width_of_second = 0;