Skip to content
Snippets Groups Projects
Commit c4c2415d authored by Liam Coursodon's avatar Liam Coursodon Committed by Liam Coursodon
Browse files

Connection monitoring : Correct layout after migration

Change-Id: I8c480be77e1ef0a8778d4e8420523b71c76c4555
parent b2318c7f
No related branches found
No related tags found
No related merge requests found
...@@ -44,7 +44,6 @@ ConnectionInfoListModel::data(const QModelIndex& index, int role) const ...@@ -44,7 +44,6 @@ ConnectionInfoListModel::data(const QModelIndex& index, int role) const
} }
const auto peerId = peerIds_[index.row()]; const auto peerId = peerIds_[index.row()];
const auto peerData = peerData_[peerId]; const auto peerData = peerData_[peerId];
switch (role) { switch (role) {
case ConnectionInfoList::ChannelsMap: { case ConnectionInfoList::ChannelsMap: {
QVariantMap channelsMapMap; QVariantMap channelsMapMap;
......
...@@ -29,6 +29,7 @@ ListView { ...@@ -29,6 +29,7 @@ ListView {
height: contentItem.childrenRect.height height: contentItem.childrenRect.height
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: 10 anchors.topMargin: 10
width: parent.width
spacing: 5 spacing: 5
cacheBuffer: 10 cacheBuffer: 10
...@@ -51,7 +52,7 @@ ListView { ...@@ -51,7 +52,7 @@ ListView {
id: profile id: profile
height: 50 height: 50
Layout.leftMargin: 5 Layout.leftMargin: 5
Layout.preferredWidth: 210 Layout.preferredWidth: 200
color: JamiTheme.transparentColor color: JamiTheme.transparentColor
Text { Text {
id: textImage id: textImage
...@@ -65,6 +66,7 @@ ListView { ...@@ -65,6 +66,7 @@ ListView {
Rectangle { Rectangle {
id: device id: device
Layout.fillWidth: true Layout.fillWidth: true
Layout.minimumWidth: 50
height: 50 height: 50
color: JamiTheme.transparentColor color: JamiTheme.transparentColor
Text { Text {
...@@ -106,6 +108,7 @@ ListView { ...@@ -106,6 +108,7 @@ ListView {
} }
model: ConnectionInfoListModel model: ConnectionInfoListModel
Timer { Timer {
interval: 1000 interval: 1000
running: root.visible running: root.visible
...@@ -125,6 +128,7 @@ ListView { ...@@ -125,6 +128,7 @@ ListView {
ListView { ListView {
id: listView2 id: listView2
height: 40 * Count height: 40 * Count
width: parent.width
anchors.top: delegate.top anchors.top: delegate.top
...@@ -141,7 +145,7 @@ ListView { ...@@ -141,7 +145,7 @@ ListView {
id: profile id: profile
height: 50 height: 50
Layout.leftMargin: 5 Layout.leftMargin: 5
Layout.preferredWidth: 210 Layout.preferredWidth: 200
color: JamiTheme.transparentColor color: JamiTheme.transparentColor
Avatar { Avatar {
id: avatar id: avatar
...@@ -174,6 +178,7 @@ ListView { ...@@ -174,6 +178,7 @@ ListView {
Text { Text {
id: usernameText id: usernameText
color: JamiTheme.textColor color: JamiTheme.textColor
anchors.fill: parent
text: UtilsAdapter.getBestNameForUri(CurrentAccount.id, PeerId) text: UtilsAdapter.getBestNameForUri(CurrentAccount.id, PeerId)
elide: Text.ElideRight elide: Text.ElideRight
} }
...@@ -227,6 +232,7 @@ ListView { ...@@ -227,6 +232,7 @@ ListView {
Rectangle { Rectangle {
height: 40 height: 40
Layout.fillWidth: true Layout.fillWidth: true
Layout.minimumWidth: 50
color: delegate.color color: delegate.color
Text { Text {
id: delegateDeviceText id: delegateDeviceText
......
...@@ -30,6 +30,7 @@ SettingsPageBase { ...@@ -30,6 +30,7 @@ SettingsPageBase {
id: root id: root
Layout.fillWidth: true Layout.fillWidth: true
Layout.minimumWidth: 700
readonly property string baseProviderPrefix: 'image://avatarImage' readonly property string baseProviderPrefix: 'image://avatarImage'
...@@ -96,7 +97,13 @@ SettingsPageBase { ...@@ -96,7 +97,13 @@ SettingsPageBase {
Rectangle { Rectangle {
id: connectionMonitoringTable id: connectionMonitoringTable
height: listview.childrenRect.height + 60 height: listview.childrenRect.height + 60
width: tableWidth width: {
if (tableWidth > 477) {
return tableWidth;
} else {
return 477;
}
}
color: JamiTheme.transparentColor color: JamiTheme.transparentColor
ConnectionMonitoringTable { ConnectionMonitoringTable {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment