status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(desktop/statusQ) Updated StatusQ HEAD 

Also updated all StatusModals to use contentItem
instead of content
This commit is contained in:
Alexandra Betouni 2021-09-02 17:40:10 +03:00 committed by Iuri Matias
parent c33c7ce45a
commit 8d32c1d933
12 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/StatusQ

@ -1 +1 @@
Subproject commit b45aba4be88fbdd4adf901b90dbe07c93c98aaea
Subproject commit 4a6800ed77c272cec02abcd8734dc28c23831e42

2
ui/app/AppLayouts/Chat/CommunityComponents/CommunitiesPopup.qml
View File

@ -40,7 +40,7 @@ StatusModal {
}
}
content: Column {
contentItem: Column {
width: popup.width
property alias searchBox: searchBox

2
ui/app/AppLayouts/Chat/CommunityComponents/CommunityDetailPopup.qml
View File

@ -54,7 +54,7 @@ StatusModal {
return subTitle
}
content: Column {
contentItem: Column {
width: popup.width
Item {

2
ui/app/AppLayouts/Chat/CommunityComponents/CommunityProfilePopup.qml
View File

@ -24,7 +24,7 @@ StatusModal {
header.icon.isLetterIdenticon: contentComponent.currentItem.headerTitle == popup.community.name && !contentComponent.currentItem.headerImageSource
header.icon.background.color: popup.community.communityColor
content: StackView {
contentItem: StackView {
id: stack
initialItem: profileOverview
anchors.centerIn: parent

2
ui/app/AppLayouts/Chat/CommunityComponents/CreateCategoryPopup.qml
View File

@ -44,7 +44,7 @@ StatusModal {
//% "New category"
qsTrId("new-category")
content: Column {
contentItem: Column {
width: popup.width
property alias categoryName: nameInput

2
ui/app/AppLayouts/Chat/CommunityComponents/CreateChannelPopup.qml
View File

@ -45,7 +45,7 @@ StatusModal {
contentComponent.channelDescription.valid
}
content: ScrollView {
contentItem: ScrollView {
id: scrollView

2
ui/app/AppLayouts/Chat/CommunityComponents/CreateCommunityPopup.qml
View File

@ -51,7 +51,7 @@ StatusModal {
//% "New community"
qsTrId("new-community")
content: ScrollView {
contentItem: ScrollView {
id: scrollView

2
ui/app/AppLayouts/Chat/CommunityComponents/InviteFriendsToCommunityPopup.qml
View File

@ -31,7 +31,7 @@ StatusModal {
//% "Invite friends"
header.title: qsTrId("invite-friends")
content: CommunityProfilePopupInviteFriendsView {
contentItem: CommunityProfilePopupInviteFriendsView {
id: contactFieldAndList
contactListSearch.onUserClicked: {
if (isContact) {

2
ui/app/AppLayouts/Chat/CommunityComponents/MembershipRequestsPopup.qml
View File

@ -21,7 +21,7 @@ StatusModal {
header.title: qsTrId("membership-requests")
header.subTitle: contentComponent.membershipRequestList.count
content: Column {
contentItem: Column {
property alias errorText: errorText
property alias membershipRequestList: membershipRequestList
width: popup.width

2
ui/app/AppLayouts/Chat/CommunityComponents/MembershipRequirementPopup.qml
View File

@ -21,7 +21,7 @@ StatusModal {
id: membershipRequirementGroup
}
content: Column {
contentItem: Column {
width: popup.width
spacing: 8

2
ui/app/AppLayouts/Chat/CommunityComponents/TransferOwnershipPopup.qml
View File

@ -21,7 +21,7 @@ StatusModal {
popup.destroy();
}
content: Item {
contentItem: Item {
width: popup.width
height: Math.max(300, content.height + 32)
Column {

2
ui/app/AppLayouts/Chat/components/ProfilePopup.qml
View File

@ -70,7 +70,7 @@ StatusModal {
onClicked: contentComponent.qrCodePopup.open()
}
content: Item {
contentItem: Item {
width: popup.width
height: modalContent.height