Merge pull request 'only show settings icon in history warning for default state' (#449) from assetry into master
the build was successful Details

Reviewed-on: #449
This commit is contained in:
Sarah Jamie Lewis 2020-12-09 14:11:14 -08:00
commit dfb12a2ab0
1 changed files with 17 additions and 9 deletions

View File

@ -80,16 +80,24 @@ W.Overlay {
)
}
Opaque.Icon {
Loader {
anchors.horizontalCenter: parent.horizontalCenter
backgroundColor: Theme.backgroundMainColor
iconColor: Theme.chatOverlayWarningTextColor
source: gcd.assetPath + "core/peer_settings-24px.webp"
size: Theme.uiIconSizeM
sourceWidth: 72
sourceHeight: 72
width: Theme.uiIconSizeM
height: Theme.uiIconSizeM
height: overlayRoot.historyState == "DefaultDeleteHistory" ? Theme.uiIconSizeM : 0
sourceComponent: overlayRoot.historyState == "DefaultDeleteHistory" ? settingsIcon : undefined
}
Component {
id: settingsIcon
Opaque.Icon {
backgroundColor: Theme.backgroundMainColor
iconColor: Theme.chatOverlayWarningTextColor
source: gcd.assetPath + "core/peer_settings-24px.webp"
size: Theme.uiIconSizeM
sourceWidth: 72
sourceHeight: 72
width: Theme.uiIconSizeM
height: Theme.uiIconSizeM
}
}
Opaque.HLine {}