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): Fix scrolling in chat components, wallet fixes

This commit is contained in:
MishkaRogachev 2022-07-20 17:54:30 +03:00 committed by Mikhail Rogachev
parent 667db7038a
commit 9aa1a1073e
18 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/app/AppLayouts/Browser/panels/FavoritesList.qml
View File

@ -1,10 +1,12 @@
import QtQuick 2.13
import StatusQ.Core 0.1
import utils 1.0
import "../controls"
GridView {
StatusGridView {
id: bookmarkGrid
property var determineRealURLFn: function(url){}

5
ui/app/AppLayouts/CommunitiesPortal/panels/CommunityColorPanel.qml
View File

@ -35,12 +35,11 @@ StatusScrollView {
hexInput.text = color.toString();
}
ScrollBar.vertical.policy: ScrollBar.AsNeeded
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
padding: 0
ColumnLayout {
id: column
width: root.width - root.leftPadding - root.rightPadding
width: root.availableWidth
spacing: 12
StatusColorSpace {

5
ui/app/AppLayouts/CommunitiesPortal/panels/CommunityTagsPanel.qml
View File

@ -61,8 +61,7 @@ StatusScrollView {
}
onSelectedTagsChanged: updateSelectedTags()
ScrollBar.vertical.policy: ScrollBar.AsNeeded
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
padding: 0
QtObject {
id: d
@ -73,7 +72,7 @@ StatusScrollView {
ColumnLayout {
id: column
width: root.width - root.leftPadding - root.rightPadding
width: root.availableWidth
spacing: 20
StatusInput {

4
ui/app/AppLayouts/Onboarding/views/SeedPhraseInputView.qml
View File

@ -7,9 +7,11 @@ import StatusQ.Controls 0.1
import StatusQ.Popups 0.1
import StatusQ.Core 0.1
import StatusQ.Core.Theme 0.1
import utils 1.0
import shared.stores 1.0
import shared.controls 1.0
import "../controls"
import "../stores"
@ -131,7 +133,7 @@ OnboardingBasePage {
}
clip: true
GridView {
StatusGridView {
id: grid
width: parent.width
property var wordIndex: [

3
ui/app/AppLayouts/Profile/popups/backupseed/ConfirmSeedPhrasePanel.qml
View File

@ -2,6 +2,7 @@ import QtQuick 2.12
import QtQuick.Layouts 1.12
import QtGraphicalEffects 1.13
import StatusQ.Core 0.1
import StatusQ.Core.Theme 0.1
import StatusQ.Controls 0.1
@ -20,7 +21,7 @@ BackupSeedStepBase {
implicitHeight: 304
Layout.fillWidth: true
GridView {
StatusGridView {
id: grid
leftMargin: grid.spacing/2
width: cellWidth*2

6
ui/app/AppLayouts/Profile/views/EnsTermsAndConditionsView.qml
View File

@ -83,6 +83,7 @@ Item {
title: qsTr("Terms of name registration")
StatusScrollView {
id: scroll
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
ScrollBar.vertical.policy: ScrollBar.AlwaysOn
width: parent.width
@ -91,7 +92,7 @@ Item {
Column {
spacing: Style.current.halfPadding
height: childrenRect.height
width: parent.width
width: scroll.availableWidth
StatusBaseText {
@ -223,8 +224,7 @@ Item {
Item {
id: contentItem
anchors.right: parent.right;
anchors.left: parent.left;
width: sview.availableWidth
Rectangle {
id: circleAt

2
ui/app/AppLayouts/Profile/views/EnsWelcomeView.qml
View File

@ -25,11 +25,11 @@ Item {
anchors.bottomMargin: Style.current.padding
anchors.left: parent.left
anchors.right: parent.right
contentWidth: contentItem.width
Item {
id: contentItem
width: profileContentWidth
anchors.horizontalCenter: parent.horizontalCenter
Image {
id: image

2
ui/app/AppLayouts/Wallet/panels/ImportSeedPhrasePanel.qml
View File

@ -9,7 +9,7 @@ import shared.stores 1.0
import "../stores"
GridView {
StatusGridView {
id: grid
property bool isValid: false

2
ui/app/AppLayouts/Wallet/popups/AddAccountModal.qml
View File

@ -154,7 +154,7 @@ StatusModal {
contentItem: StatusScrollView {
id: scroll
width: root.width
width: popup.width
topPadding: Style.current.halfPadding
bottomPadding: Style.current.halfPadding
leftPadding: Style.current.padding

4
ui/app/AppLayouts/Wallet/views/LeftTabView.qml
View File

@ -85,7 +85,7 @@ Rectangle {
Layout.fillHeight: true
Layout.topMargin: Style.current.halfPadding
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
// ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
delegate: StatusListItem {
width: ListView.view.width
@ -126,8 +126,6 @@ Rectangle {
// model: RootStore.exampleWalletModel
}
Item { Layout.fillHeight: true }
StatusButton {
size: StatusBaseButton.Size.Small
topPadding: Style.current.halfPadding

3
ui/imports/shared/controls/RecipientSelector.qml
View File

@ -25,7 +25,6 @@ Item {
property alias additionalInfo: txtAddlInfo.text
property var selectedRecipient
property bool readOnly: false
height: inpAddress.height + txtLabel.height
readonly property string addressValidationError: qsTr("Invalid ethereum address")
property alias wrongInputValidationError: inpAddress.wrongInputValidationError
property bool isValid: false
@ -115,6 +114,8 @@ Item {
}
}
implicitHeight: inpAddress.height + txtLabel.height
Text {
id: txtLabel
visible: label !== ""

1
ui/imports/shared/status/StatusChatInput.qml
View File

@ -945,6 +945,7 @@ Rectangle {
id: messageInputField
property var lastClick: 0
property int cursorWhenPressed: 0
width: scrollView.availableWidth
textFormat: Text.RichText
font.pixelSize: 15
font.family: Style.current.fontRegular.name

8
ui/imports/shared/status/StatusEmojiSection.qml
View File

@ -1,12 +1,13 @@
import QtQuick 2.13
import QtQuick.Layouts 1.3
import StatusQ.Core 0.1
import StatusQ.Components 0.1
import utils 1.0
import shared 1.0
import shared.panels 1.0
import StatusQ.Components 0.1
Item {
id: emojiSection
property string searchString: ""
@ -64,7 +65,7 @@ Item {
this.emojis = this.allEmojis
}
GridView {
StatusGridView {
id: emojiGrid
anchors.top: categoryText.bottom
anchors.topMargin: Style.current.smallPadding
@ -75,7 +76,6 @@ Item {
cellHeight: emojiSection.imageWidth + emojiSection.imageMargin * 2
model: emojiSection.emojis
focus: true
clip: true
interactive: false
delegate: Item {

3
ui/imports/shared/status/StatusGifPopup.qml
View File

@ -308,8 +308,7 @@ Popup {
Row {
id: gifs
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
width: scrollView.availableWidth
spacing: Style.current.halfPadding
property string lastHoveredId

5
ui/imports/shared/status/StatusStickerList.qml
View File

@ -3,11 +3,13 @@ import QtQuick.Controls 2.13
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0
import StatusQ.Core 0.1
import utils 1.0
import shared 1.0
import shared.panels 1.0
GridView {
StatusGridView {
id: root
property int packId: -1
property var stickerGrid
@ -17,7 +19,6 @@ GridView {
cellHeight: 88
model: stickerList
focus: true
clip: true
signal stickerClicked(string hash, int packId)
delegate: Item {
width: root.cellWidth

5
ui/imports/shared/status/StatusStickerMarket.qml
View File

@ -4,6 +4,8 @@ import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0
import QtQml.Models 2.13
import StatusQ.Core 0.1
import utils 1.0
import shared 1.0
import shared.panels 1.0
@ -28,7 +30,7 @@ Item {
signal updateClicked(int packId)
signal buyClicked(int packId)
GridView {
StatusGridView {
id: availableStickerPacks
width: parent.width
height: 380
@ -42,7 +44,6 @@ Item {
cellHeight: height - 72
focus: true
clip: true
model: DelegateModel {
id: delegateModel

2
ui/imports/shared/status/StatusStickersPopup.qml
View File

@ -236,7 +236,9 @@ Popup {
RowLayout {
id: stickersRowLayout
width: scrollView.availableWidth
spacing: Style.current.padding
Repeater {
id: stickerPackListView
property int selectedPackId: -1

10
ui/imports/shared/views/TabAddressSelectorView.qml
View File

@ -19,7 +19,7 @@ import "../views"
Item {
id: root
clip: true
height: accountSelectionTabBar.height + stackLayout.height + Style.current.xlPadding
implicitHeight: accountSelectionTabBar.height + stackLayout.height + Style.current.xlPadding
property var store
@ -73,7 +73,7 @@ Item {
header: savedAddresses.count > 0 ? search : nothingInList
headerPositioning: ListView.OverlayHeader
delegate: StatusListItem {
width: visible ? parent.width: 0
width: visible ? savedAddresses.availableWidth : 0
height: visible ? 64 : 0
title: name
subTitle: address
@ -126,9 +126,9 @@ Item {
height: Math.min(288, myAccounts.contentHeight)
delegate: StatusListItem {
width: visible ? parent.width: 0
width: myAccounts.availableWidth
height: visible ? 64 : 0
title: model.name
title: !!model.name ? model.name : ""
subTitle: Utils.toLocaleString(model.currencyBalance.toFixed(2), store.locale, {"model.currency": true}) + " " + store.currentCurrency.toUpperCase()
icon.emoji: !!model.emoji ? model.emoji: ""
icon.color: model.color
@ -166,7 +166,7 @@ Item {
delegate: StatusListItem {
property bool isIncoming: to === store.currentAccount.address
width: visible ? parent.width: 0
width: visible ? recents.availableWidth : 0
height: visible ? 64 : 0
title: isIncoming ? from : to
subTitle: Utils.getTimeDifference(new Date(parseInt(timestamp) * 1000), new Date())