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(StatusDialogFooter): Prevent footer's buttons overflow

This commit is contained in:
Michał Cieślak 2024-02-08 17:59:53 +01:00 committed by Michał
parent 480985ca4e
commit 6aee04e33e
8 changed files with 130 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
storybook/pages/StatusDialogFooterPage.qml Normal file
View File

@ -0,0 +1,89 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import QtQml.Models 2.15
import Storybook 1.0
import StatusQ.Controls 0.1
import StatusQ.Popups.Dialog 0.1
SplitView {
id: root
orientation: Qt.Vertical
Item {
SplitView.fillWidth: true
SplitView.fillHeight: true
Rectangle {
border.color: "lightgray"
anchors.fill: footer
anchors.margins: -5
}
StatusDialogFooter {
id: footer
anchors.centerIn: parent
width: widthNotSpecifiedCheckBox.checked
? undefined
: Math.floor(root.width * slider.value)
rightButtons: ObjectModel {
StatusButton {
id: rejectBtn
text: qsTr("I I don't want to be the owner")
}
StatusButton {
id: acceptBtn
text: qsTr("Finalize owhership")
}
}
leftButtons: ObjectModel {
StatusBackButton {
id: backButton
Layout.minimumWidth: implicitWidth
}
}
}
}
LogsAndControlsPanel {
SplitView.minimumHeight: 100
SplitView.preferredHeight: 200
SplitView.fillWidth: true
ColumnLayout {
Label {
text: `Footer width: ${footer.width}`
}
Label {
text: `Footer implicitWidth: ${footer.implicitWidth}`
}
Slider {
id: slider
enabled: !widthNotSpecifiedCheckBox.checked
from: 0.2
to: 1
value: 0.5
}
CheckBox {
id: widthNotSpecifiedCheckBox
text: "width not specified"
}
}
}
}
// category: Components

16
ui/StatusQ/src/StatusQ/Popups/Dialog/StatusDialogFooter.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQml.Models 2.14
import QtQuick 2.15
import QtQuick.Layouts 1.15
import QtQml.Models 2.15
import StatusQ.Core 0.1
import StatusQ.Core.Theme 0.1
@ -31,7 +31,10 @@ Rectangle {
Repeater {
model: root.leftButtons
onItemAdded: item.Layout.fillHeight = true
onItemAdded: {
item.Layout.fillHeight = true
item.Layout.fillWidth = Qt.binding(() => root.width < root.implicitWidth)
}
}
Item {
@ -40,7 +43,10 @@ Rectangle {
Repeater {
model: root.rightButtons
onItemAdded: item.Layout.fillHeight = true
onItemAdded: {
item.Layout.fillHeight = true
item.Layout.fillWidth = Qt.binding(() => root.width < root.implicitWidth)
}
}
}

7
ui/app/AppLayouts/Communities/popups/CommunityProfilePopup.qml
View File

@ -1,5 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import StatusQ.Controls 0.1
import StatusQ.Popups 0.1
@ -79,6 +80,8 @@ StatusModal {
onClicked: {
contentItem.pop()
}
Layout.minimumWidth: implicitWidth
}
]
}

2
ui/app/AppLayouts/Communities/popups/CreateChannelPopup.qml
View File

@ -286,6 +286,8 @@ StatusStackModal {
d.currentPage = (d.currentPage === CreateChannelPopup.CurrentPage.DiscordImportUploadStart) ?
CreateChannelPopup.CurrentPage.DiscordImportUploadFile : CreateChannelPopup.CurrentPage.ChannelDetails
}
Layout.minimumWidth: implicitWidth
}

7
ui/app/AppLayouts/Communities/popups/FinaliseOwnershipPopup.qml
View File

@ -132,6 +132,7 @@ StatusDialog {
footer: StatusDialogFooter {
spacing: Style.current.padding
rightButtons: ObjectModel {
StatusFlatButton {
id: rejectBtn
@ -149,7 +150,11 @@ StatusDialog {
}
}
leftButtons: ObjectModel {
StatusBackButton { id: backButton }
StatusBackButton {
id: backButton
Layout.minimumWidth: implicitWidth
}
}
}

10
ui/imports/shared/popups/addaccount/AddAccountPopup.qml
View File

@ -1,5 +1,6 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import StatusQ.Core 0.1
import StatusQ.Popups 0.1
@ -201,8 +202,9 @@ StatusModal {
objectName: "AddAccountPopup-BackButton"
visible: root.store.currentState.displayBackButton
enabled: !root.store.disablePopup
height: Constants.addAccountPopup.footerButtonsHeight
width: height
Layout.minimumWidth: implicitWidth
onClicked: {
if (root.store.currentState.stateType === Constants.addAccountPopup.state.confirmAddingNewMasterKey) {
root.store.addingNewMasterKeyConfirmed = false

8
ui/imports/shared/popups/keycard/KeycardPopupDetails.qml
View File

@ -1,4 +1,5 @@
import QtQuick 2.14
import QtQuick 2.15
import QtQuick.Layouts 1.15
import StatusQ.Controls 0.1
import StatusQ.Core.Theme 0.1
@ -58,8 +59,9 @@ QtObject {
id: backButton
visible: root.sharedKeycardModule.currentState.displayBackButton
enabled: !root.disableActionPopupButtons
height: Constants.keycard.general.footerButtonsHeight
width: height
Layout.minimumWidth: implicitWidth
onClicked: {
root.sharedKeycardModule.currentState.doBackAction()
}

10
ui/imports/shared/popups/keypairimport/KeypairImportPopup.qml
View File

@ -1,5 +1,6 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import StatusQ.Core 0.1
import StatusQ.Popups 0.1
@ -150,8 +151,9 @@ StatusModal {
StatusBackButton {
id: backButton
visible: root.store.currentState.displayBackButton
height: Constants.keypairImportPopup.footerButtonsHeight
width: height
Layout.minimumWidth: implicitWidth
onClicked: {
root.store.currentState.doBackAction()
}