From 983dd84efa27f18067d6541b114159d0f01b51f7 Mon Sep 17 00:00:00 2001
From: Sarah Jamie Lewis <sarah@openprivacy.ca>
Date: Tue, 17 Nov 2020 12:02:12 -0800
Subject: [PATCH] Svg -> Webp

---
 Button.qml   |  2 +-
 ComboBox.qml |  2 +-
 Icon.qml     |  1 +
 Toolbar.qml  | 14 +++++++-------
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Button.qml b/Button.qml
index 0582ade..02fffb3 100644
--- a/Button.qml
+++ b/Button.qml
@@ -40,7 +40,7 @@ Rectangle {
 
         Image {
             id: ico
-            source: icon!="" ? gcd.assetPath + "fontawesome/"+icon+".svg" : "";
+            source: icon!="" ? gcd.assetPath + "fontawesome/"+icon+".webp" : "";
             visible: icon != ""
             height: button.height / 2
             sourceSize.height: button.height / 2
diff --git a/ComboBox.qml b/ComboBox.qml
index 1c80ab8..36e406f 100644
--- a/ComboBox.qml
+++ b/ComboBox.qml
@@ -62,7 +62,7 @@ ComboBox {
 
         Icon {
             iconColor: Theme.toolbarIconColor
-            source: gcd.assetPath + "core/chevron_left-24px.svg"
+            source: gcd.assetPath + "core/chevron_left-24px.webp"
 
             anchors.verticalCenter: parent.verticalCenter
             anchors.horizontalCenter: parent.horizontalCenter
diff --git a/Icon.qml b/Icon.qml
index f9e4000..da605d8 100644
--- a/Icon.qml
+++ b/Icon.qml
@@ -48,6 +48,7 @@ Rectangle {
         // Apparently qml can now only DOWN-SCALE/SHRINK the SVG, so with this hack it which won't cause blurriness/pixelation
         sourceSize.width: size*2
         sourceSize.height: size*2
+
     }
 
     ColorOverlay{
diff --git a/Toolbar.qml b/Toolbar.qml
index 8d55326..4f4444b 100644
--- a/Toolbar.qml
+++ b/Toolbar.qml
@@ -37,13 +37,13 @@ Rectangle { // Global Toolbar
     Icon {
         id: btnLeftMenu
         iconColor: Theme.toolbarIconColor
-        source: gcd.assetPath + "core/menu-24px.svg"
+        source: gcd.assetPath + "core/menu-24px.webp"
 
 
         anchors.verticalCenter: parent.verticalCenter
         anchors.left: parent.left
-        width: 30
-        height: 30
+        width: 30 * gcd.themeScale
+        height: 30 * gcd.themeScale
 
         onClicked: { leftMenu() }
     }
@@ -51,12 +51,12 @@ Rectangle { // Global Toolbar
     Icon {
         id: btnLeftBack
         iconColor: Theme.toolbarIconColor
-        source: gcd.assetPath + "core/chevron_left-24px.svg"
+        source: gcd.assetPath + "core/chevron_left-24px.webp"
 
         anchors.verticalCenter: parent.verticalCenter
         anchors.left: parent.left
-        width: 30
-        height: 30
+        width: 30 * gcd.themeScale
+        height: 30 * gcd.themeScale
 
         onClicked: { back() }
     }
@@ -90,7 +90,7 @@ Rectangle { // Global Toolbar
     Icon {
         id: btnRightMenu
         iconColor: Theme.toolbarIconColor
-        source: gcd.assetPath + "core/more_vert-24px.svg"
+        source: gcd.assetPath + "core/more_vert-24px.webp"
 
         visible: false
         anchors.verticalCenter: parent.verticalCenter