From 622d20afa8264a658b2dab328dfadac785f06e4c Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 14 Apr 2020 20:25:29 +0200 Subject: [PATCH] Some more polish --- approot/playqueue.xml | 2 +- approot/release.xml | 2 +- docroot/css/lms-darkly.css | 9 ++------- docroot/css/lms-flatly.css | 11 +++-------- docroot/css/lms.css | 6 +++++- src/lms/ui/LmsApplication.cpp | 11 ++++++----- src/lms/ui/PlayQueueView.cpp | 11 +++-------- src/lms/ui/explore/Explore.cpp | 1 + src/lms/ui/explore/ReleaseView.cpp | 6 ++++-- 9 files changed, 26 insertions(+), 33 deletions(-) diff --git a/approot/playqueue.xml b/approot/playqueue.xml index 0a09276c..4ee29a99 100644 --- a/approot/playqueue.xml +++ b/approot/playqueue.xml @@ -29,7 +29,7 @@ -
+

${name}

${} diff --git a/approot/release.xml b/approot/release.xml index af5d0e44..57fc3439 100644 --- a/approot/release.xml +++ b/approot/release.xml @@ -23,7 +23,7 @@ -
+
${}${disc-number}-${}${}${track-number}${}
diff --git a/docroot/css/lms-darkly.css b/docroot/css/lms-darkly.css index 9bcc7a1f..8cbb660a 100644 --- a/docroot/css/lms-darkly.css +++ b/docroot/css/lms-darkly.css @@ -1,6 +1,7 @@ :root { --hover-color: #00bc8c; --body-color: #cacaca; + --playing-background-color: #375a7f4f; --slider-background-color: #5a5a5a; } @@ -17,7 +18,7 @@ a.Lms-artistname.text-primary:hover { color: var(--hover-color) } -.Lms-player-btn { +.Lms-control-btn { color: var(--body-color) } @@ -33,12 +34,6 @@ a.Lms-releasename.text-primary:hover { color: var(--body-color) } -/* -.Lms-entry-hoverable:hover { - filter: drop-shadow(0 0 0.2rem darkgrey); -} -*/ - .media, .media-body { overflow: visible; } diff --git a/docroot/css/lms-flatly.css b/docroot/css/lms-flatly.css index a1dd7f1f..9e9e817a 100644 --- a/docroot/css/lms-flatly.css +++ b/docroot/css/lms-flatly.css @@ -1,7 +1,8 @@ :root { - --hover-color: #18bc9c; --body-color: #2c3e50; - --slider-background-color: #c0cfde; + --hover-color: #18bc9c; + --playing-background-color: #2c3e5029; + --slider-background-color: #2c3e5029; } .Lms-artistname.text-muted { @@ -9,12 +10,6 @@ color: #7e8f9e; } -/* -.Lms-entry-hoverable:hover { - filter: drop-shadow(0 0 0.2rem darkgrey); -} -*/ - .media, .media-body { overflow: visible; } diff --git a/docroot/css/lms.css b/docroot/css/lms.css index aa6b498d..6aef4dd3 100644 --- a/docroot/css/lms.css +++ b/docroot/css/lms.css @@ -179,6 +179,8 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { .Lms-explore-release-entry-playing { font-weight: bold; + border-radius: 3px; + background-color: var(--playing-background-color); } .Lms-explore-release-entry-track-duration { @@ -298,7 +300,9 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { } .Lms-playqueue-selected { - font-weight: 800; + font-weight: bold; + border-radius: 3px; + background-color: var(--playing-background-color); } .Lms-playqueue-selected h4 { diff --git a/src/lms/ui/LmsApplication.cpp b/src/lms/ui/LmsApplication.cpp index 0f490b94..b4b2c9c7 100644 --- a/src/lms/ui/LmsApplication.cpp +++ b/src/lms/ui/LmsApplication.cpp @@ -124,11 +124,11 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, { return { - Wt::WLinkedCssStyleSheet {Wt::WLink {"css/bootstrap-flatly.min.css"}}, - Wt::WLinkedCssStyleSheet {Wt::WLink {"css/lms-flatly.css"}}, -// Wt::WLinkedCssStyleSheet {Wt::WLink {"css/bootstrap-darkly.min.css"}}, -// Wt::WLinkedCssStyleSheet {Wt::WLink {"css/lms-darkly.css"}}, - Wt::WLinkedCssStyleSheet { Wt::WLink {"resources/themes/bootstrap/3/wt.css"}}, +// Wt::WLinkedCssStyleSheet {Wt::WLink {"css/bootstrap-flatly.min.css"}}, + Wt::WLinkedCssStyleSheet {Wt::WLink {"css/bootstrap-darkly.min.css"}}, + Wt::WLinkedCssStyleSheet {Wt::WLink {"resources/themes/bootstrap/3/wt.css"}}, +// Wt::WLinkedCssStyleSheet {Wt::WLink {"css/lms-flatly.css"}}, + Wt::WLinkedCssStyleSheet {Wt::WLink {"css/lms-darkly.css"}}, }; } }; @@ -491,6 +491,7 @@ LmsApplication::createHome() // Contents // Order is important in mainStack, see IdxRoot! Wt::WStackedWidget* mainStack = main->bindNew("contents"); + mainStack->setAttributeValue("style", "overflow-x:visible;overflow-y:visible;"); Explore* explore = mainStack->addNew(); PlayQueue* playqueue = mainStack->addNew(); diff --git a/src/lms/ui/PlayQueueView.cpp b/src/lms/ui/PlayQueueView.cpp index 86850c71..9a35ea87 100644 --- a/src/lms/ui/PlayQueueView.cpp +++ b/src/lms/ui/PlayQueueView.cpp @@ -284,14 +284,9 @@ PlayQueue::updateCurrentTrack(bool selected) if (!_trackPos || *_trackPos >= static_cast(_entriesContainer->count())) return; - auto track = _entriesContainer->widget(*_trackPos); - if (track) - { - if (selected) - track->addStyleClass("Lms-playqueue-selected"); - else - track->removeStyleClass("Lms-playqueue-selected"); - } + Wt::WTemplate* entry {static_cast(_entriesContainer->widget(*_trackPos))}; + if (entry) + entry->bindString("is-selected", selected ? "Lms-playqueue-selected" : ""); } void diff --git a/src/lms/ui/explore/Explore.cpp b/src/lms/ui/explore/Explore.cpp index 659aac58..860230d0 100644 --- a/src/lms/ui/explore/Explore.cpp +++ b/src/lms/ui/explore/Explore.cpp @@ -119,6 +119,7 @@ Explore::Explore() // Contents Wt::WStackedWidget* contentsStack = bindNew("contents"); + contentsStack->setAttributeValue("style", "overflow-x:visible;overflow-y:visible;"); auto artists = std::make_unique(_filters); artists->artistsAdd.connect(this, &Explore::handleArtistsAdd); diff --git a/src/lms/ui/explore/ReleaseView.cpp b/src/lms/ui/explore/ReleaseView.cpp index bf00c451..36fd1e3c 100644 --- a/src/lms/ui/explore/ReleaseView.cpp +++ b/src/lms/ui/explore/ReleaseView.cpp @@ -212,11 +212,13 @@ Release::refresh() LmsApp->getEvents().trackLoaded.connect(entry, [=] (Database::IdType loadedTrackId, bool /*play*/) { - entry->toggleStyleClass("Lms-explore-release-entry-playing", loadedTrackId == trackId); + entry->bindString("is-playing", loadedTrackId == trackId ? "Lms-explore-release-entry-playing" : ""); }); if (LmsApp->getEvents().lastLoadedTrackId && *LmsApp->getEvents().lastLoadedTrackId == trackId) - entry->addStyleClass("Lms-explore-release-entry-playing"); + { + entry->bindString("is-playing", "Lms-explore-release-entry-playing"); + } } }