From 6e3cfaf84ad41cbf6810bb80bd5146a292331164 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 27 Mar 2022 15:10:45 +0200 Subject: [PATCH] Fixed releases in search view limited to 6 results --- approot/releases.xml | 4 ++-- src/libs/utils/impl/http/Client.hpp | 4 +--- src/lms/ui/LmsApplication.cpp | 1 - src/lms/ui/explore/Explore.cpp | 1 - src/lms/ui/explore/SearchView.cpp | 4 +--- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/approot/releases.xml b/approot/releases.xml index f7c5debc..2cfd84b0 100644 --- a/approot/releases.xml +++ b/approot/releases.xml @@ -13,9 +13,9 @@
${cover class="shadow-sm"} - ${release-name} + ${release-name class="text-truncate text-nowrap"} ${}${year}${} - ${}${artist-name}${} + ${}${artist-name class=" text-truncate text-nowrap"}${} ${}${tr:Lms.Explore.various-artists}${}
diff --git a/src/libs/utils/impl/http/Client.hpp b/src/libs/utils/impl/http/Client.hpp index f6a42b40..30b7bd61 100644 --- a/src/libs/utils/impl/http/Client.hpp +++ b/src/libs/utils/impl/http/Client.hpp @@ -32,15 +32,13 @@ namespace Http { public: Client(boost::asio::io_context& ioContext, std::string_view baseUrl) - : _ioContext {ioContext} - , _sendQueue {ioContext, baseUrl} + : _sendQueue {ioContext, baseUrl} {} private: void sendGETRequest(ClientGETRequestParameters&& request) override; void sendPOSTRequest(ClientPOSTRequestParameters&& request) override; - boost::asio::io_context& _ioContext; SendQueue _sendQueue; }; } // namespace Http diff --git a/src/lms/ui/LmsApplication.cpp b/src/lms/ui/LmsApplication.cpp index f5664a17..1ba367ce 100644 --- a/src/lms/ui/LmsApplication.cpp +++ b/src/lms/ui/LmsApplication.cpp @@ -492,7 +492,6 @@ 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(filters)}; _playQueue = mainStack->addNew(); diff --git a/src/lms/ui/explore/Explore.cpp b/src/lms/ui/explore/Explore.cpp index bf9b1239..15c94fc4 100644 --- a/src/lms/ui/explore/Explore.cpp +++ b/src/lms/ui/explore/Explore.cpp @@ -86,7 +86,6 @@ Explore::Explore(Filters* filters) // Contents Wt::WStackedWidget* contentsStack = bindNew("contents"); - contentsStack->setAttributeValue("style", "overflow-x:visible;overflow-y:visible;"); auto artists = std::make_unique(*_filters); contentsStack->addWidget(std::move(artists)); diff --git a/src/lms/ui/explore/SearchView.cpp b/src/lms/ui/explore/SearchView.cpp index 056ae799..91bc27cf 100644 --- a/src/lms/ui/explore/SearchView.cpp +++ b/src/lms/ui/explore/SearchView.cpp @@ -52,7 +52,6 @@ namespace UserInterface addFunction("tr", &Wt::WTemplate::Functions::tr); Wt::WStackedWidget* stack {bindNew("stack")}; - stack->setAttributeValue("style", "overflow-x:visible;overflow-y:visible;"); _menu = bindNew("mode", stack); auto addItem = [=](const Wt::WString& str, [[maybe_unused]] Mode mode, const Wt::WString& templateStr, std::function onRequestElementsFunc) @@ -159,7 +158,6 @@ namespace UserInterface SearchView::addSomeReleases() { InfiniteScrollingContainer& results {getResultContainer(Mode::Release)}; - bool moreResults {}; { using namespace Database; @@ -175,7 +173,7 @@ namespace UserInterface results.add(ReleaseListHelpers::createEntry(release)); } - results.setHasMore(moreResults); + results.setHasMore(releaseIds.moreResults); } getItemMenu(Mode::Release).setDisabled(results.getCount() == 0);