From be219f317dd72605a9fed3beb92c8c149cb15338 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Fri, 29 Mar 2019 01:07:05 +1100 Subject: [PATCH] some ui improvements --- debian/control | 2 +- ui/keyframenavigator.cpp | 6 ++++++ ui/sourceiconview.cpp | 2 +- ui/timelineheader.cpp | 4 ++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index c156631bf..092cc89ab 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,6 @@ Homepage: https://olivevideoeditor.org/ Package: olive-editor Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, libqt5multimedia5-plugins, frei0r-plugins +Depends: ${misc:Depends}, ${shlibs:Depends}, libqt5multimedia5-plugins Description: Nonlinear video editor focused on performance and simplicity diff --git a/ui/keyframenavigator.cpp b/ui/keyframenavigator.cpp index 9a60dd4cc..ec1c1b034 100644 --- a/ui/keyframenavigator.cpp +++ b/ui/keyframenavigator.cpp @@ -39,7 +39,11 @@ KeyframeNavigator::KeyframeNavigator(QWidget *parent, bool addLeftPad) : QWidget key_controls->addStretch(); } + QSizePolicy button_size_policy; + button_size_policy.setRetainSizeWhenHidden(true); + left_key_nav = new QPushButton(this); + left_key_nav->setSizePolicy(button_size_policy); left_key_nav->setIcon(olive::icon::LeftArrow); left_key_nav->setIconSize(left_key_nav->iconSize()*0.5); left_key_nav->setVisible(false); @@ -48,6 +52,7 @@ KeyframeNavigator::KeyframeNavigator(QWidget *parent, bool addLeftPad) : QWidget connect(left_key_nav, SIGNAL(clicked(bool)), this, SIGNAL(clicked())); key_addremove = new QPushButton(this); + key_addremove->setSizePolicy(button_size_policy); key_addremove->setIcon(olive::icon::Diamond); key_addremove->setIconSize(key_addremove->iconSize()*0.5); key_addremove->setVisible(false); @@ -56,6 +61,7 @@ KeyframeNavigator::KeyframeNavigator(QWidget *parent, bool addLeftPad) : QWidget connect(key_addremove, SIGNAL(clicked(bool)), this, SIGNAL(clicked())); right_key_nav = new QPushButton(this); + right_key_nav->setSizePolicy(button_size_policy); right_key_nav->setIcon(olive::icon::RightArrow); right_key_nav->setIconSize(right_key_nav->iconSize()*0.5); right_key_nav->setVisible(false); diff --git a/ui/sourceiconview.cpp b/ui/sourceiconview.cpp index e8fbf0fbd..60bd06184 100644 --- a/ui/sourceiconview.cpp +++ b/ui/sourceiconview.cpp @@ -98,7 +98,7 @@ SourceIconDelegate::SourceIconDelegate(QObject *parent) : { } -QSize SourceIconDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const +QSize SourceIconDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &) const { if (option.decorationPosition == QStyleOptionViewItem::Top) { // Icon Mode diff --git a/ui/timelineheader.cpp b/ui/timelineheader.cpp index a1779c85d..96c07b66c 100644 --- a/ui/timelineheader.cpp +++ b/ui/timelineheader.cpp @@ -468,6 +468,10 @@ void TimelineHeader::paintEvent(QPaintEvent*) { path.lineTo(in_x+PLAYHEAD_SIZE+1, yoff); path.lineTo(start); p.fillPath(path, Qt::red); + + // Draw white line at the top for clarity + p.setPen(Qt::gray); + p.drawLine(0, 0, width(), 0); } }