From 95a095fd2248bfd797ac48116421ef33bf29afdf Mon Sep 17 00:00:00 2001 From: Hussam Eddin Alhomsi Date: Fri, 13 Oct 2017 15:30:15 +0300 Subject: [PATCH 1/4] Initial commit. --- data/themes/default/style.css | 12 +++--------- data/themes/default/track_op_grip_c.png | Bin 0 -> 157 bytes data/themes/default/trackop_h.png | Bin 403 -> 0 bytes src/core/Track.cpp | 19 ++++++++----------- 4 files changed, 11 insertions(+), 20 deletions(-) create mode 100644 data/themes/default/track_op_grip_c.png delete mode 100644 data/themes/default/trackop_h.png diff --git a/data/themes/default/style.css b/data/themes/default/style.css index dbcb39fa557..b91b8ba18b0 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -320,20 +320,14 @@ TrackOperationsWidget > QPushButton::menu-indicator { subcontrol-origin: padding; subcontrol-position: center; position: relative; - top: 2px; -} - -TrackOperationsWidget > QPushButton::menu-indicator:hover { - image: url(resources:trackop_h.png); + top: 1px; } - TrackOperationsWidget > QPushButton::menu-indicator:pressed, -TrackOperationsWidget > QPushButton::menu-indicator:checked - { +TrackOperationsWidget > QPushButton::menu-indicator:checked { image: url(resources:trackop_c.png); position: relative; - top: 3px; + top: 2px; } /* font sizes */ diff --git a/data/themes/default/track_op_grip_c.png b/data/themes/default/track_op_grip_c.png new file mode 100644 index 0000000000000000000000000000000000000000..0faccddabb57b652d0008f8c6f1d8a68c008eb77 GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol@0V0Kb;z1N!lDE4H!+#K5uy^@npa^GyM`STj z$8`{9bkdkz0Tg5}@$_|Nf5^ql#iZrS(^Cl)((-h14AD5B{OAAw|MhGf2`LUtK0Fo- t+`GI|I7>dvUl90WnsHy0-5OnXhLnB0{^eP*AeOHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IX1_nj}PZ!4! zi{7OwCt|etGV|*ereP`N#Fj9FGFbN ztv!LSg)Yb+h*kXlplI!PrWEdNT#9?r8>TLCKJ`00v3-sqx8J0=x#h78_jdf&OPX_} z{9<1f^Q##wF^tvIqf@7E75>7ycQf;fH&s0e%o{Wq|Hs}id{eYv?)lk7#x;%C8lw_Y u@AaQmyuHsYDlPowx6mNI8JCV)e-meQcHsQv%W(@BfDE3lelF{r5}E)HRi&K( diff --git a/src/core/Track.cpp b/src/core/Track.cpp index 163e0efd3b3..fc2578c8717 100644 --- a/src/core/Track.cpp +++ b/src/core/Track.cpp @@ -1667,12 +1667,6 @@ TrackOperationsWidget::TrackOperationsWidget( TrackView * parent ) : QWidget( parent ), /*!< The parent widget */ m_trackView( parent ) /*!< The parent track view */ { - if( s_grip == NULL ) - { - s_grip = new QPixmap( embed::getIconPixmap( - "track_op_grip" ) ); - } - ToolTip::add( this, tr( "Press <%1> while clicking on move-grip " "to begin a new drag'n'drop-action." ).arg( #ifdef LMMS_BUILD_APPLE @@ -1795,14 +1789,17 @@ void TrackOperationsWidget::paintEvent( QPaintEvent * pe ) if( m_trackView->isMovingTrack() == false ) { + s_grip = new QPixmap( embed::getIconPixmap( + "track_op_grip" ) ); + p.drawPixmap( 2, 2, *s_grip ); - m_trackOps->show(); - m_muteBtn->show(); } else { - m_trackOps->hide(); - m_muteBtn->hide(); + s_grip = new QPixmap( embed::getIconPixmap( + "track_op_grip_c" ) ); + + p.drawPixmap( 2, 2, *s_grip ); } } @@ -2745,7 +2742,7 @@ void TrackView::mousePressEvent( QMouseEvent * me ) { m_action = MoveTrack; - QCursor c( Qt::SizeAllCursor ); + QCursor c( Qt::SizeVerCursor ); QApplication::setOverrideCursor( c ); // update because in move-mode, all elements in // track-op-widgets are hidden as a visual feedback From 14461e541335d5ae40e12dc8f7ab2ab2a68684c8 Mon Sep 17 00:00:00 2001 From: Hussam Eddin Alhomsi Date: Fri, 13 Oct 2017 17:11:29 +0300 Subject: [PATCH 2/4] Fixes. --- data/themes/classic/style.css | 10 ++++------ data/themes/default/style.css | 2 +- data/themes/default/trackop_c.png | Bin 403 -> 0 bytes 3 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 data/themes/default/trackop_c.png diff --git a/data/themes/classic/style.css b/data/themes/classic/style.css index 1ace5a8e863..cf5c224004a 100644 --- a/data/themes/classic/style.css +++ b/data/themes/classic/style.css @@ -320,7 +320,7 @@ TrackOperationsWidget > QPushButton { min-height: 26px; min-width: 26px; background: none; - border:none; + border: none; } TrackOperationsWidget > QPushButton::menu-indicator { @@ -328,20 +328,18 @@ TrackOperationsWidget > QPushButton::menu-indicator { subcontrol-origin: padding; subcontrol-position: center; position: relative; - top: 2px; + top: 1px; } TrackOperationsWidget > QPushButton::menu-indicator:hover { image: url(resources:trackop_h.png); } - TrackOperationsWidget > QPushButton::menu-indicator:pressed, -TrackOperationsWidget > QPushButton::menu-indicator:checked - { +TrackOperationsWidget > QPushButton::menu-indicator:checked { image: url(resources:trackop_c.png); position: relative; - top: 3px; + top: 2px; } /* actually has no effect yet so disabled */ diff --git a/data/themes/default/style.css b/data/themes/default/style.css index b91b8ba18b0..695e9b6fd86 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -325,7 +325,7 @@ TrackOperationsWidget > QPushButton::menu-indicator { TrackOperationsWidget > QPushButton::menu-indicator:pressed, TrackOperationsWidget > QPushButton::menu-indicator:checked { - image: url(resources:trackop_c.png); + image: url(resources:trackop.png); position: relative; top: 2px; } diff --git a/data/themes/default/trackop_c.png b/data/themes/default/trackop_c.png deleted file mode 100644 index b26dd6ef26a3f426043288746533a1a94d5e7769..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 403 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VOR^eP*AeOHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IX1_nj}PZ!4! zi{7OwCt|etGV|*ereP`N#Fj9FGFbN ztv!LSg)Yb+h*kXlplI!PrWEdNT#9?r8>TLCKJ`00v3-sqx8J0=x#h78_jdf&OPX_} z{9<1f^Q##wF^tvIqf@7E75>7ycQf;fH&s0e%o{Wq|Hs}id{eYv?)lk7#x;%C8lw_Y u@AaQmyuHsYDlPowx6mNI8JCV)e-meQcHsQv%W(@BfDE3lelF{r5}E)HRi&K( From 135119029e11923d2ae7e09f7f6702bc027d2062 Mon Sep 17 00:00:00 2001 From: Hussam Eddin Alhomsi Date: Fri, 13 Oct 2017 23:02:36 +0300 Subject: [PATCH 3/4] Limit moving to the grip. --- src/core/Track.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/core/Track.cpp b/src/core/Track.cpp index fc2578c8717..d68d0f938f2 100644 --- a/src/core/Track.cpp +++ b/src/core/Track.cpp @@ -2710,6 +2710,12 @@ void TrackView::dropEvent( QDropEvent * de ) */ void TrackView::mousePressEvent( QMouseEvent * me ) { + if(me->x()>10) // 10 = The width of the grip + 2 pixels to the left and right. + { + QWidget::mousePressEvent( me ); + return; + } + // If previously dragged too small, restore on shift-leftclick if( height() < DEFAULT_TRACK_HEIGHT && me->modifiers() & Qt::ShiftModifier && From 622b87b45c948384ed20a658a25988bbcf4113b3 Mon Sep 17 00:00:00 2001 From: Hussam Eddin Alhomsi Date: Fri, 13 Oct 2017 23:03:57 +0300 Subject: [PATCH 4/4] Tiny fix. --- src/core/Track.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/Track.cpp b/src/core/Track.cpp index d68d0f938f2..c2b8be11049 100644 --- a/src/core/Track.cpp +++ b/src/core/Track.cpp @@ -2710,7 +2710,7 @@ void TrackView::dropEvent( QDropEvent * de ) */ void TrackView::mousePressEvent( QMouseEvent * me ) { - if(me->x()>10) // 10 = The width of the grip + 2 pixels to the left and right. + if( me->x()>10 ) // 10 = The width of the grip + 2 pixels to the left and right. { QWidget::mousePressEvent( me ); return;