Fix review comments. Use QImage for QML and QPixmap for rest of code. Do not cache images for QML. Fix tests. Use signal in QML.

Signed-off-by: alex-z <blackslayer4@gmail.com>

3 files changed, 5 insertions, 7 deletions

diff --git a/src/gui/tray/UnifiedSearchInputContainer.qml b/src/gui/tray/UnifiedSearchInputContainer.qml
index 3a021eda0..2edbfbac6 100644
--- a/src/gui/tray/UnifiedSearchInputContainer.qml
+++ b/src/gui/tray/UnifiedSearchInputContainer.qml
@@ -17,7 +17,7 @@ TextField {
 
     readonly property int textFieldHorizontalPaddingOffset: 14
 
-    property var onClearText: function(){}
+    signal clearText()
 
     leftPadding: trayWindowUnifiedSearchTextFieldSearchIcon.width + trayWindowUnifiedSearchTextFieldSearchIcon.anchors.leftMargin + textFieldHorizontalPaddingOffset
     rightPadding: trayWindowUnifiedSearchTextFieldClearTextButton.width + trayWindowUnifiedSearchTextFieldClearTextButton.anchors.rightMargin + textFieldHorizontalPaddingOffset
@@ -87,7 +87,7 @@ TextField {
 
             anchors.fill: parent
 
-            onClicked: trayWindowUnifiedSearchTextField.onClearText()
+            onClicked: trayWindowUnifiedSearchTextField.clearText()
         }
     }
 }
diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index 637d727d5..eab74c981 100644
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -588,7 +588,7 @@ Window {
             readOnly: !UserModel.currentUser.isConnected || UserModel.currentUser.unifiedSearchResultsListModel.currentFetchMoreInProgressProviderId

             isSearchInProgress: UserModel.currentUser.unifiedSearchResultsListModel.isSearchInProgress

             onTextEdited: { UserModel.currentUser.unifiedSearchResultsListModel.searchTerm = trayWindowUnifiedSearchInputContainer.text }

-            onClearText: function () { UserModel.currentUser.unifiedSearchResultsListModel.searchTerm = "" }

+            onClearText: { UserModel.currentUser.unifiedSearchResultsListModel.searchTerm = "" }

         }

 

         ErrorBox {

diff --git a/src/gui/tray/svgimageprovider.cpp b/src/gui/tray/svgimageprovider.cpp
index 2f8c1f0ba..ab5760700 100644
--- a/src/gui/tray/svgimageprovider.cpp
+++ b/src/gui/tray/svgimageprovider.cpp
@@ -28,11 +28,9 @@ namespace Ui {
 
     QImage SvgImageProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize)
     {
-        Q_UNUSED(size)
-
         Q_ASSERT(!id.isEmpty());
 
-        const auto idSplit = id.split(QLatin1Char('/'), Qt::SkipEmptyParts);
+        const auto idSplit = id.split(QStringLiteral("/"), Qt::SkipEmptyParts);
 
         if (idSplit.isEmpty()) {
             qCWarning(lcSvgImageProvider) << "Image id is incorrect!";
@@ -47,7 +45,7 @@ namespace Ui {
             return {};
         }
 
-        return IconUtils::createSvgPixmapWithCustomColor(pixmapName, pixmapColor, requestedSize).toImage();
+        return IconUtils::createSvgImageWithCustomColor(pixmapName, pixmapColor, size, requestedSize);
     }
 }
 }