Merge branch 'master' of https://git.openprivacy.ca/openprivacy/opaque
This commit is contained in:
commit
b8d0133878
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
1
Icon.qml
1
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{
|
||||
|
|
14
Toolbar.qml
14
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
|
||||
|
|
Loading…
Reference in New Issue