Commit fd51d25d authored by camilo higuita's avatar camilo higuita

fixes for kirigami and android

parent fe470fe5
...@@ -163,8 +163,9 @@ Maui.ApplicationWindow ...@@ -163,8 +163,9 @@ Maui.ApplicationWindow
headBar.spacing: space.big headBar.spacing: space.big
headBar.middleContent : Kirigami.ActionToolBar headBar.middleContent : Kirigami.ActionToolBar
{ {
display: isWide ? ToolButton.TextBesideIcon : ToolButton.TextUnderIcon // display: isWide ? ToolButton.TextBesideIcon : ToolButton.TextUnderIcon
Layout.fillWidth: true position: Controls.ToolBar.Header
Layout.fillWidth: false
hiddenActions: [ hiddenActions: [
Kirigami.Action Kirigami.Action
...@@ -654,6 +655,7 @@ Layout.fillWidth: true ...@@ -654,6 +655,7 @@ Layout.fillWidth: true
contentItem: MainPlaylist contentItem: MainPlaylist
{ {
id: mainPlaylist id: mainPlaylist
z: 999
Connections Connections
{ {
target: mainPlaylist target: mainPlaylist
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
vvave::vvave(QObject *parent) : QObject(parent), vvave::vvave(QObject *parent) : QObject(parent),
notify(new Notify(this)),
db(CollectionDB::getInstance()) db(CollectionDB::getInstance())
{ {
for(const auto &path : {BAE::CachePath, BAE::YoutubeCachePath}) for(const auto &path : {BAE::CachePath, BAE::YoutubeCachePath})
...@@ -36,21 +35,11 @@ vvave::vvave(QObject *parent) : QObject(parent), ...@@ -36,21 +35,11 @@ vvave::vvave(QObject *parent) : QObject(parent),
dirPath.mkpath("."); dirPath.mkpath(".");
} }
#if (defined (Q_OS_LINUX) && !defined (Q_OS_ANDROID)) //#if (defined (Q_OS_LINUX) && !defined (Q_OS_ANDROID))
if(!FMH::fileExists(BAE::NotifyDir+"/vvave.notifyrc")) // if(!FMH::fileExists(BAE::NotifyDir+"/vvave.notifyrc"))
QFile::copy(":/assets/vvave.notifyrc", BAE::NotifyDir+"/vvave.notifyrc"); // QFile::copy(":/assets/vvave.notifyrc", BAE::NotifyDir+"/vvave.notifyrc");
connect(this->notify, &Notify::babeSong, [this]()
{
// emit this->babeIt();
});
connect(this->notify, &Notify::skipSong, [this]() //#endif
{
// emit this->skipTrack();
});
#endif
} }
vvave::~vvave() {} vvave::~vvave() {}
......
...@@ -5,13 +5,11 @@ ...@@ -5,13 +5,11 @@
#include "utils/bae.h" #include "utils/bae.h"
#include <functional> #include <functional>
class Notify;
class CollectionDB; class CollectionDB;
class vvave : public QObject class vvave : public QObject
{ {
Q_OBJECT Q_OBJECT
private: private:
Notify *notify;
CollectionDB *db; CollectionDB *db;
void checkCollection(const QStringList &paths = BAE::defaultSources, std::function<void (uint)> cb = nullptr); void checkCollection(const QStringList &paths = BAE::defaultSources, std::function<void (uint)> cb = nullptr);
......
...@@ -32,6 +32,7 @@ ListView ...@@ -32,6 +32,7 @@ ListView
// onCurrentIndexChanged: Player.playAt(currentIndex) // onCurrentIndexChanged: Player.playAt(currentIndex)
delegate: GridLayout delegate: GridLayout
{ {
height: albumsRollRoot.height height: albumsRollRoot.height
...@@ -103,6 +104,23 @@ ListView ...@@ -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) function positionAlbum(index)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment