fix profile badges to use icons; fix myprofile not re embiggening on single pane
the build was successful
Details
the build was successful
Details
This commit is contained in:
parent
4b081a0db6
commit
23eece4424
|
@ -1 +1 @@
|
|||
Subproject commit d9cc60c21f7e263960307bb9b06963dd759c74b6
|
||||
Subproject commit 365eedbd90eb936043e42f632355862d2a34c77a
|
|
@ -38,13 +38,14 @@ Item {
|
|||
if (dualPane) {
|
||||
profile.height = Theme.contactPortraitSize * logscale
|
||||
|
||||
portrait.baseWidth = Theme.contactPortraitSize * logscale
|
||||
portrait.height = Theme.contactPortraitSize * logscale
|
||||
|
||||
portrait.anchors.horizontalCenter = undefined
|
||||
portrait.anchors.left = profile.left
|
||||
portrait.anchors.leftMargin = 25 * logscale
|
||||
|
||||
portrait.size = Theme.contactPortraitSize * logscale
|
||||
|
||||
profiletype.height = Theme.badgeTextSize * gcd.themeScale
|
||||
|
||||
nameRow.anchors.right = undefined
|
||||
nameRow.anchors.left = portrait.right
|
||||
|
||||
|
@ -56,12 +57,14 @@ Item {
|
|||
} else {
|
||||
profile.height = (Theme.contactPortraitSize * 2 * logscale)
|
||||
|
||||
portrait.size = Theme.contactPortraitSize * 1.5
|
||||
|
||||
portrait.anchors.left = undefined
|
||||
portrait.anchors.leftMargin = undefined
|
||||
portrait.anchors.horizontalCenter = profile.horizontalCenter
|
||||
|
||||
portrait.size = Theme.contactPortraitSize * 1.5
|
||||
|
||||
profiletype.height = Theme.badgeTextSize * gcd.themeScale * 1.5
|
||||
|
||||
nameRow.anchors.left = profile.left
|
||||
nameRow.anchors.right = profile.right
|
||||
|
||||
|
@ -91,11 +94,15 @@ Item {
|
|||
portraitBorderColor: Theme.portraitOnlineBorderColor
|
||||
portraitColor: Theme.portraitOnlineBackgroundColor
|
||||
|
||||
badgeContent: Image {// Profle Type
|
||||
badgeContent: Opaque.Icon {// Profle Type
|
||||
id: profiletype
|
||||
source: tag == "v1-userPassword" ? gcd.assetPath + "core/lock-24px.webp" : gcd.assetPath + "core/lock_open-24px.webp"
|
||||
height: Theme.badgeTextSize * gcd.themeScale
|
||||
width: height
|
||||
|
||||
iconColor: Theme.defaultButtonTextColor
|
||||
backgroundColor: portrait.badgeColor
|
||||
hilightBackgroundColor: portrait.badgeColor
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -125,6 +132,7 @@ Item {
|
|||
|
||||
anchors.left: name.right
|
||||
anchors.top: name.top
|
||||
anchors.leftMargin: 10 * gcd.themeScale
|
||||
|
||||
icon: "fontawesome/solid/plus"
|
||||
|
||||
|
|
|
@ -33,11 +33,15 @@ RowLayout {
|
|||
nameColor: Theme.portraitOnlineTextColor
|
||||
onionColor: Theme.portraitOnlineTextColor
|
||||
|
||||
badgeContent: Image {// Profle Type
|
||||
badgeContent: Opaque.Icon {// Profle Type
|
||||
id: profiletype
|
||||
source: tag == "v1-userPassword" ? gcd.assetPath + "core/lock-24px.webp" : gcd.assetPath + "core/lock_open-24px.webp"
|
||||
height: Theme.badgeTextSize * gcd.themeScale
|
||||
width: height
|
||||
|
||||
iconColor: Theme.defaultButtonTextColor
|
||||
backgroundColor: prow.badgeColor
|
||||
hilightBackgroundColor: prow.badgeColor
|
||||
}
|
||||
|
||||
onClicked: rowClicked(handle)
|
||||
|
|
Reference in New Issue