diff --git a/app/widget/marker/marker.cpp b/app/widget/marker/marker.cpp index 7b8db781b..2ab2b7306 100644 --- a/app/widget/marker/marker.cpp +++ b/app/widget/marker/marker.cpp @@ -110,8 +110,12 @@ void Marker::paintEvent(QPaintEvent *event) void Marker::mousePressEvent(QMouseEvent* e) { - if (e->button() == Qt::LeftButton) { - static_cast(parent())->SeekToScreenPoint(e->pos().x() + this->x()); + // Only select if clicking on the icon and not the label + if (e->pos().x() > 7) { + return; + } + if (e->button() == Qt::LeftButton || e->button() == Qt::RightButton) { + static_cast(parent())->SeekToScreenPoint(this->x() + 4); if (!active_) { if (e->modifiers() != Qt::ShiftModifier) { static_cast(parent())->DeselectAllMarkers(); @@ -166,7 +170,6 @@ void Marker::SetColor(int c) void Marker::SetName(QString s) { name_ = s; - qDebug() << name_; update(); } diff --git a/app/widget/timeruler/seekablewidget.cpp b/app/widget/timeruler/seekablewidget.cpp index c2cc7cb2e..37b9cc823 100644 --- a/app/widget/timeruler/seekablewidget.cpp +++ b/app/widget/timeruler/seekablewidget.cpp @@ -237,7 +237,7 @@ void SeekableWidget::updateMarkerPositions() { foreach (TimelineMarker* marker, marker_map_.keys()) { Marker *m = marker_map_.value(marker); - m->move(TimeToScreen(marker->time().in()), text_height_); + m->move(TimeToScreen(marker->time().in())-2, text_height_); } }