cwtch.im
/
ui
Archived
6
7
Fork 2
Code Issues 64 Pull Requests 2 Releases 9 Wiki Activity

Merge pull request 'fix profile badges to use icons; fix myprofile not re embiggening on single pane' (#439) from dan/ui:badgeIcons into master
the build failed Details 

Reviewed-on: #439
This commit is contained in:
erinn 2020-12-02 15:11:08 -08:00
parent 0de8bd19bb 79a8bfb0cf
commit 96aaf1f0e9
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qml/opaque

@ -1 +1 @@
Subproject commit d9cc60c21f7e263960307bb9b06963dd759c74b6
Subproject commit 365eedbd90eb936043e42f632355862d2a34c77a

20
qml/widgets/MyProfile.qml
View File

@ -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"

6
qml/widgets/ProfileRow.qml
View File

@ -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)