diff --git a/app/widget/marker/CMakeLists.txt b/app/widget/marker/CMakeLists.txt index 4ec5cab0d..0f49bae01 100644 --- a/app/widget/marker/CMakeLists.txt +++ b/app/widget/marker/CMakeLists.txt @@ -19,4 +19,4 @@ set(OLIVE_SOURCES widget/marker/marker.h widget/marker/marker.cpp PARENT_SCOPE -) \ No newline at end of file +) diff --git a/app/widget/marker/marker.cpp b/app/widget/marker/marker.cpp index b9c7a1390..c3e77c633 100644 --- a/app/widget/marker/marker.cpp +++ b/app/widget/marker/marker.cpp @@ -53,10 +53,6 @@ void Marker::paintEvent(QPaintEvent *event) int x = half_width; //3 - if (x + half_width < 0 || x - half_width > width()) { - return; - } - QPainter p(this); p.setPen(Qt::black); p.setBrush(ColorCoding::GetColor(marker_color_).toQColor()); @@ -75,8 +71,6 @@ void Marker::paintEvent(QPaintEvent *event) }; p.drawPolygon(points, 6); - - p.setRenderHint(QPainter::Antialiasing, false); } void Marker::ShowContextMenu() { @@ -97,4 +91,4 @@ void Marker::SetColor(int c) update(); } -} // namespace olive \ No newline at end of file +} // namespace olive diff --git a/app/widget/timeruler/seekablewidget.cpp b/app/widget/timeruler/seekablewidget.cpp index 33930fb82..0227997bf 100644 --- a/app/widget/timeruler/seekablewidget.cpp +++ b/app/widget/timeruler/seekablewidget.cpp @@ -44,10 +44,6 @@ SeekableWidget::SeekableWidget(QWidget* parent) : playhead_width_ = QtUtils::QFontMetricsWidth(fm, "H"); setContextMenuPolicy(Qt::CustomContextMenu); - - marker_layout_ = new QHBoxLayout(this); - - UpdateMarkers(); } void SeekableWidget::ConnectTimelinePoints(TimelinePoints *points) @@ -135,23 +131,6 @@ void SeekableWidget::SetScroll(int s) updateMarkerPositions(); } -void SeekableWidget::UpdateMarkers() -{ - printf("Test"); - if (timeline_points()) { - foreach(Marker * marker, marker_widgets) { - marker->deleteLater(); - } - marker_widgets.clear(); - - foreach(TimelineMarker * marker, timeline_points()->markers()->list()) { - Marker* marker_widget = new Marker(); - marker_widgets.append(marker_widget); - marker_layout_->addWidget(marker_widget); - } - } -} - void SeekableWidget::addMarker(TimelineMarker* marker) { if (!marker_map_.contains(marker)) { diff --git a/app/widget/timeruler/seekablewidget.h b/app/widget/timeruler/seekablewidget.h index 6a2d84171..949345df5 100644 --- a/app/widget/timeruler/seekablewidget.h +++ b/app/widget/timeruler/seekablewidget.h @@ -58,8 +58,6 @@ public slots: void SetScroll(int s); - void UpdateMarkers(); - void addMarker(TimelineMarker* marker); void updateMarkerPositions(); @@ -111,10 +109,6 @@ private: bool dragging_; - QHBoxLayout* marker_layout_; - - QVector marker_widgets; - QMap marker_map_; };