diff --git a/main.qml b/main.qml index 588d8cbc44fd5b3231c9f9b6f1c890187830ed19..6702f9afcd7c79d8995814bbd5519e936a5a11ad 100644 --- a/main.qml +++ b/main.qml @@ -163,8 +163,9 @@ Maui.ApplicationWindow headBar.spacing: space.big headBar.middleContent : Kirigami.ActionToolBar { - display: isWide ? ToolButton.TextBesideIcon : ToolButton.TextUnderIcon -Layout.fillWidth: true +// display: isWide ? ToolButton.TextBesideIcon : ToolButton.TextUnderIcon + position: Controls.ToolBar.Header + Layout.fillWidth: false hiddenActions: [ Kirigami.Action @@ -654,12 +655,13 @@ Layout.fillWidth: true contentItem: MainPlaylist { id: mainPlaylist + z: 999 Connections { target: mainPlaylist onCoverPressed: Player.appendAll(tracks) onCoverDoubleClicked: Player.playAll(tracks) - } + } } } diff --git a/vvave.cpp b/vvave.cpp index 779856d21a15c42b93e897f39f31d6af8478cdf8..e455d1f9167ace20f3498ac930bf372419306edc 100644 --- a/vvave.cpp +++ b/vvave.cpp @@ -26,7 +26,6 @@ vvave::vvave(QObject *parent) : QObject(parent), - notify(new Notify(this)), db(CollectionDB::getInstance()) { for(const auto &path : {BAE::CachePath, BAE::YoutubeCachePath}) @@ -36,21 +35,11 @@ vvave::vvave(QObject *parent) : QObject(parent), dirPath.mkpath("."); } -#if (defined (Q_OS_LINUX) && !defined (Q_OS_ANDROID)) - if(!FMH::fileExists(BAE::NotifyDir+"/vvave.notifyrc")) - QFile::copy(":/assets/vvave.notifyrc", BAE::NotifyDir+"/vvave.notifyrc"); - - connect(this->notify, &Notify::babeSong, [this]() - { - // emit this->babeIt(); - }); +//#if (defined (Q_OS_LINUX) && !defined (Q_OS_ANDROID)) +// if(!FMH::fileExists(BAE::NotifyDir+"/vvave.notifyrc")) +// QFile::copy(":/assets/vvave.notifyrc", BAE::NotifyDir+"/vvave.notifyrc"); - connect(this->notify, &Notify::skipSong, [this]() - { - // emit this->skipTrack(); - }); - -#endif +//#endif } vvave::~vvave() {} diff --git a/vvave.h b/vvave.h index 5ff43ec573b00fd5284f1638abe508bc3de76b84..adfc1282fbe9963ef9cd66c650b96f643af2110c 100644 --- a/vvave.h +++ b/vvave.h @@ -5,13 +5,11 @@ #include "utils/bae.h" #include -class Notify; class CollectionDB; class vvave : public QObject { Q_OBJECT private: - Notify *notify; CollectionDB *db; void checkCollection(const QStringList &paths = BAE::defaultSources, std::function cb = nullptr); diff --git a/widgets/MainPlaylist/AlbumsRoll.qml b/widgets/MainPlaylist/AlbumsRoll.qml index a2449c201a997b62b45cb4190a138dc55795a00c..b2182ad5500aaa25d13c45e85ae66cf184225b9a 100644 --- a/widgets/MainPlaylist/AlbumsRoll.qml +++ b/widgets/MainPlaylist/AlbumsRoll.qml @@ -32,6 +32,7 @@ ListView // onCurrentIndexChanged: Player.playAt(currentIndex) + delegate: GridLayout { height: albumsRollRoot.height @@ -103,6 +104,23 @@ ListView } + MouseArea + { + anchors.fill : parent + preventStealing: true + parent: applicationWindow().overlay.parent + + onPressed: + { + console.log("albumsroll clicked") + mouse.accepted = false + } + + onReleased: + { + mouse.accepted = true + } + } function positionAlbum(index) {