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/issue 10905 (#10930)

This commit is contained in:
Igor Sirotin 2023-06-06 09:57:00 +03:00 committed by GitHub
parent 2a253be291
commit f86608287c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ui/app/AppLayouts/Chat/views/communities/JoinCommunityView.qml
View File

@ -36,7 +36,7 @@ StatusSectionLayout {
property bool requirementsMet: true
property bool isJoinRequestRejected: false
property bool requiresRequest: false
property alias loginType: overlayPannel.loginType
property alias loginType: overlayPanel.loginType
property var communityHoldingsModel
property var viewOnlyHoldingsModel
@ -167,7 +167,7 @@ StatusSectionLayout {
// Blur background:
Item {
Layout.fillWidth: true
Layout.preferredHeight: Math.min(centralPanelData.implicitHeight, parent.height - overlayPannel.implicitHeight)
Layout.preferredHeight: Math.min(centralPanelData.implicitHeight, parent.height - overlayPanel.implicitHeight)
ColumnLayout {
id: centralPanelData
@ -249,27 +249,34 @@ StatusSectionLayout {
anchors.fill: parent
padding: 0
JoinPermissionsOverlayPanel {
id: overlayPannel
Item {
implicitHeight: Math.max(overlayPanel.implicitHeight, panelBase.height)
implicitWidth: Math.max(overlayPanel.implicitWidth, panelBase.width)
topPadding: 2 * bottomPadding
joinCommunity: root.joinCommunity
requirementsMet: root.requirementsMet
isInvitationPending: root.isInvitationPending
isJoinRequestRejected: root.isJoinRequestRejected
requiresRequest: root.requiresRequest
communityName: root.name
communityHoldingsModel: root.communityHoldingsModel
channelName: root.channelName
JoinPermissionsOverlayPanel {
id: overlayPanel
viewOnlyHoldingsModel: root.viewOnlyHoldingsModel
viewAndPostHoldingsModel: root.viewAndPostHoldingsModel
moderateHoldingsModel: root.moderateHoldingsModel
assetsModel: root.assetsModel
collectiblesModel: root.collectiblesModel
anchors.centerIn: parent
onRevealAddressClicked: root.revealAddressClicked()
onInvitationPendingClicked: root.invitationPendingClicked()
topPadding: 2 * bottomPadding
joinCommunity: root.joinCommunity
requirementsMet: root.requirementsMet
isInvitationPending: root.isInvitationPending
isJoinRequestRejected: root.isJoinRequestRejected
requiresRequest: root.requiresRequest
communityName: root.name
communityHoldingsModel: root.communityHoldingsModel
channelName: root.channelName
viewOnlyHoldingsModel: root.viewOnlyHoldingsModel
viewAndPostHoldingsModel: root.viewAndPostHoldingsModel
moderateHoldingsModel: root.moderateHoldingsModel
assetsModel: root.assetsModel
collectiblesModel: root.collectiblesModel
onRevealAddressClicked: root.revealAddressClicked()
onInvitationPendingClicked: root.invitationPendingClicked()
}
}
}
}

1
ui/imports/shared/panels/ProfileBioSocialsPanel.qml
View File

@ -72,6 +72,7 @@ Control {
visible: root.bio
padding: 0
topPadding: Style.current.halfPadding
rightPadding: ScrollBar.vertical.visible ? 16 : 0
Layout.maximumHeight: 108