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

chore: fix last anchor warnings

This commit is contained in:
Jonathan Rainville 2020-05-27 14:40:58 -04:00 committed by Iuri Matias
parent 4a00f3f307
commit cccc7f599f
4 changed files with 346 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui/app/AppLayouts/Chat/ChatColumn.qml
View File

@ -115,7 +115,10 @@ StackLayout {
Menu { Menu {
id: contextMenu id: contextMenu
MenuItem { text: "Leave Chat"; onTriggered: chatsModel.leaveActiveChat() } MenuItem {
text: "Leave Chat"
onTriggered: chatsModel.leaveActiveChat()
}
} }
} }
} }
@ -215,7 +218,7 @@ StackLayout {
onCountChanged: { onCountChanged: {
if (!this.atYEnd) { if (!this.atYEnd) {
// User has scrolled up, we don't want to scroll back // User has scrolled up, we don't want to scroll back
return; return
} }
// positionViewAtEnd doesn't work well. Instead, we use highlightFollowsCurrentItem // positionViewAtEnd doesn't work well. Instead, we use highlightFollowsCurrentItem
@ -223,7 +226,6 @@ StackLayout {
while (this.currentIndex < this.count - 1) { while (this.currentIndex < this.count - 1) {
this.incrementCurrentIndex() this.incrementCurrentIndex()
} }
} }
} }
} }
@ -310,11 +312,13 @@ StackLayout {
} }
} }
} }
} }
Item { Item {
id: element Layout.fillHeight: true
Layout.fillWidth: true
Item {
id: walkieTalkieContainer
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 200 anchors.leftMargin: 200
anchors.right: parent.right anchors.right: parent.right
@ -336,9 +340,11 @@ StackLayout {
} }
} }
} }
}
/*##^## /*##^##
Designer { Designer {
D{i:0;formeditorColor:"#ffffff";height:770;width:800} D{i:0;formeditorColor:"#ffffff";height:770;width:800}
} }
##^##*/ ##^##*/

24
ui/app/AppLayouts/Chat/ContactsColumn.qml
View File

@ -14,11 +14,7 @@ Item {
id: contactsColumn id: contactsColumn
width: 300 width: 300
Layout.minimumWidth: 200 Layout.minimumWidth: 200
Layout.fillHeight: true
Item {
Layout.preferredHeight: 100
Layout.fillHeight: false
Layout.fillWidth: true
Text { Text {
id: title id: title
@ -75,6 +71,7 @@ Item {
Rectangle { Rectangle {
id: addChat id: addChat
x: 183
width: 36 width: 36
height: 36 height: 36
color: Theme.blue color: Theme.blue
@ -245,11 +242,17 @@ Item {
} }
} }
} }
}
StackLayout { StackLayout {
Layout.fillHeight: true anchors.bottom: parent.bottom
Layout.fillWidth: true anchors.bottomMargin: 0
anchors.left: parent.left
anchors.leftMargin: 0
anchors.right: parent.right
anchors.rightMargin: 0
anchors.top: searchBox.bottom
anchors.topMargin: 16
currentIndex: chatGroupsListView.count > 0 ? 1 : 0 currentIndex: chatGroupsListView.count > 0 ? 1 : 0
Item { Item {
@ -321,12 +324,11 @@ Item {
} }
} }
} }
}
Item { Item {
id: chatGroupsContainer id: chatGroupsContainer
Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true
Component { Component {
id: chatViewDelegate id: chatViewDelegate
@ -437,6 +439,8 @@ Item {
} }
} }
}
/*##^## /*##^##
Designer { Designer {
D{i:0;formeditorColor:"#ffffff";height:770;width:300} D{i:0;formeditorColor:"#ffffff";height:770;width:300}

2
ui/app/AppLayouts/Profile/ProfileLayout.qml
View File

@ -99,7 +99,7 @@ Item {
ListView { ListView {
id: contactListView id: contactListView
anchors.topMargin: 48 anchors.topMargin: 48
anchors.top: element4.bottom anchors.top: element2.bottom
anchors.fill: parent anchors.fill: parent
model: profileModel.contactList model: profileModel.contactList
delegate: contactsList delegate: contactsList

3
ui/app/AppLayouts/Wallet/LeftTab.qml
View File

@ -6,10 +6,9 @@ import Qt.labs.platform 1.1
import "../../../imports" import "../../../imports"
import "../../../shared" import "../../../shared"
Column { Item {
id: walletInfoContainer id: walletInfoContainer
width: 340 width: 340
spacing: 0
Text { Text {
id: title id: title