Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings

3 files changed, 7 insertions, 2 deletions

diff --git a/launcher/ui/widgets/PageContainer_p.h b/launcher/ui/widgets/PageContainer_p.h
index da1a66f4..8bf26618 100644
--- a/launcher/ui/widgets/PageContainer_p.h
+++ b/launcher/ui/widgets/PageContainer_p.h
@@ -103,6 +103,8 @@ public:
         setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Expanding);
         setItemDelegate(new PageViewDelegate(this));
         setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+        // Adjust margins when using Breeze theme
+        setProperty("_kde_side_panel_view", true);
     }
 
     virtual QSize sizeHint() const
diff --git a/launcher/ui/widgets/VariableSizedImageObject.cpp b/launcher/ui/widgets/VariableSizedImageObject.cpp
index 991b4a04..3aa3343d 100644
--- a/launcher/ui/widgets/VariableSizedImageObject.cpp
+++ b/launcher/ui/widgets/VariableSizedImageObject.cpp
@@ -26,6 +26,7 @@
 #include "Application.h"
 
 #include "net/NetJob.h"
+#include "net/ApiDownload.h"
 
 enum FormatProperties { ImageData = QTextFormat::UserProperty + 1 };
 
@@ -97,7 +98,7 @@ void VariableSizedImageObject::loadImage(QTextDocument* doc, const QUrl& source,
         QString("images/%1").arg(QString(QCryptographicHash::hash(source.toEncoded(), QCryptographicHash::Algorithm::Sha1).toHex())));
 
     auto job = new NetJob(QString("Load Image: %1").arg(source.fileName()), APPLICATION->network());
-    job->addNetAction(Net::Download::makeCached(source, entry));
+    job->addNetAction(Net::ApiDownload::makeCached(source, entry));
 
     auto full_entry_path = entry->getFullPath();
     auto source_url = source;
diff --git a/launcher/ui/widgets/WideBar.cpp b/launcher/ui/widgets/WideBar.cpp
index a77c45fe..3b57ee89 100644
--- a/launcher/ui/widgets/WideBar.cpp
+++ b/launcher/ui/widgets/WideBar.cpp
@@ -204,8 +204,10 @@ static void copyAction(QAction* from, QAction* to)
 
 void WideBar::showVisibilityMenu(QPoint const& position)
 {
-    if (!m_bar_menu)
+    if (!m_bar_menu) {
         m_bar_menu = std::make_unique<QMenu>(this);
+        m_bar_menu->setTearOffEnabled(true);
+    }
 
     if (m_menu_state == MenuState::Dirty) {
         for (auto* old_action : m_bar_menu->actions())