remove loader from image so the icons are not reloaded each time a list layout change
remove button color warning
This commit is contained in:
parent
fa3ef0b1a8
commit
7a4adbcbb4
3 changed files with 71 additions and 78 deletions
|
|
@ -52,9 +52,9 @@ Control.Button {
|
||||||
property real keyboardFocusedBorderWidth: Utils.getSizeWithScreenRatio(3)
|
property real keyboardFocusedBorderWidth: Utils.getSizeWithScreenRatio(3)
|
||||||
// Image properties
|
// Image properties
|
||||||
property var contentImageColor: style?.image? style.image.normal : DefaultStyle.main2_600
|
property var contentImageColor: style?.image? style.image.normal : DefaultStyle.main2_600
|
||||||
property var hoveredImageColor: style?.image? style.image.hovered : Qt.darker(contentImageColor, 1.05)
|
property var hoveredImageColor: style && style.image && style.image.hovered ? style.image.hovered : Qt.darker(contentImageColor, 1.05)
|
||||||
property var checkedImageColor: style?.image? style.image.checked : Qt.darker(contentImageColor, 1.1)
|
property var checkedImageColor: style && style.image && style.image.checked ? style.image.checked : Qt.darker(contentImageColor, 1.1)
|
||||||
property var pressedImageColor: style?.image? style.image.pressed : Qt.darker(contentImageColor, 1.1)
|
property var pressedImageColor: style && style.image && style.image.pressed ? style.image.pressed : Qt.darker(contentImageColor, 1.1)
|
||||||
icon.source: style?.iconSource || ""
|
icon.source: style?.iconSource || ""
|
||||||
property color colorizationColor: checkable && checked
|
property color colorizationColor: checkable && checked
|
||||||
? checkedImageColor
|
? checkedImageColor
|
||||||
|
|
@ -153,7 +153,6 @@ Control.Button {
|
||||||
}
|
}
|
||||||
|
|
||||||
component ButtonImage: EffectImage {
|
component ButtonImage: EffectImage {
|
||||||
asynchronous: mainItem.asynchronous
|
|
||||||
imageSource: mainItem.icon.source
|
imageSource: mainItem.icon.source
|
||||||
imageWidth: mainItem.icon.width
|
imageWidth: mainItem.icon.width
|
||||||
imageHeight: mainItem.icon.height
|
imageHeight: mainItem.icon.height
|
||||||
|
|
|
||||||
|
|
@ -102,7 +102,6 @@ Loader{
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
width: parent.width / 4.5
|
width: parent.width / 4.5
|
||||||
height: width
|
height: width
|
||||||
asynchronous: true
|
|
||||||
imageSource: mainItem.secured ? AppIcons.trusted : AppIcons.notTrusted
|
imageSource: mainItem.secured ? AppIcons.trusted : AppIcons.notTrusted
|
||||||
fillMode: Image.PreserveAspectFit
|
fillMode: Image.PreserveAspectFit
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,11 +5,10 @@ import QtQuick.Effects
|
||||||
|
|
||||||
import Linphone
|
import Linphone
|
||||||
|
|
||||||
// The loader is needed here to refresh the colorization effect (effect2) which is not refreshed when visibility change
|
// TODO : A loader may be needed here to refresh the colorization effect (effect2) which is not refreshed when visibility change
|
||||||
// and causes colorization issue when effect image is inside a popup
|
// and causes colorization issue when effect image is inside a popup (not seen in the popup recently tested, may be an obsolete bug)
|
||||||
Loader {
|
Item {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
active: visible
|
|
||||||
property url imageSource: ""
|
property url imageSource: ""
|
||||||
property var fillMode: Image.PreserveAspectFit
|
property var fillMode: Image.PreserveAspectFit
|
||||||
property var colorizationColor
|
property var colorizationColor
|
||||||
|
|
@ -18,8 +17,6 @@ Loader {
|
||||||
property bool useColor: colorizationColor != undefined
|
property bool useColor: colorizationColor != undefined
|
||||||
property bool shadowEnabled: false
|
property bool shadowEnabled: false
|
||||||
property bool isImageReady: false
|
property bool isImageReady: false
|
||||||
asynchronous: true
|
|
||||||
sourceComponent: Component{Item {
|
|
||||||
Image {
|
Image {
|
||||||
id: image
|
id: image
|
||||||
visible: !effect2.effectEnabled
|
visible: !effect2.effectEnabled
|
||||||
|
|
@ -85,5 +82,3 @@ Loader {
|
||||||
z: mainItem.z - 1
|
z: mainItem.z - 1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue