Fix colors and alignment in dialogs
3 files changed, 10 insertions, 23 deletions
diff --git a/resources/qml/dialogs/InviteDialog.qml b/resources/qml/dialogs/InviteDialog.qml
index 3acaa69d..9ddf8ed0 100644
--- a/resources/qml/dialogs/InviteDialog.qml
+++ b/resources/qml/dialogs/InviteDialog.qml
@@ -114,8 +114,7 @@ ApplicationWindow {
id: layout
spacing: Nheko.paddingMedium
- anchors.verticalCenter: parent.verticalCenter
- x: parent.x + Nheko.paddingSmall
+ anchors.centerIn: parent
width: del.width - Nheko.paddingSmall * 2
Avatar {
@@ -132,26 +131,20 @@ ApplicationWindow {
Label {
text: model.displayName
- color: TimelineManager.userColor(model ? model.mxid : "", Nheko.colors.window)
+ color: TimelineManager.userColor(model ? model.mxid : "", del.background.color)
font.pointSize: fontMetrics.font.pointSize
}
Label {
text: model.mxid
- color: Nheko.colors.buttonText
+ color: del.hovered ? Nheko.colors.brightText : Nheko.colors.buttonText
font.pointSize: fontMetrics.font.pointSize * 0.9
}
- Item {
- Layout.fillHeight: true
- Layout.fillWidth: true
- }
-
}
Item {
Layout.fillWidth: true
- Layout.fillHeight: true
}
ImageButton {
diff --git a/resources/qml/dialogs/ReadReceipts.qml b/resources/qml/dialogs/ReadReceipts.qml
index 1afa4785..52e4512b 100644
--- a/resources/qml/dialogs/ReadReceipts.qml
+++ b/resources/qml/dialogs/ReadReceipts.qml
@@ -102,15 +102,10 @@ ApplicationWindow {
font.pointSize: fontMetrics.font.pointSize * 0.9
}
- Item {
- Layout.fillWidth: true
- }
-
}
Item {
Layout.fillWidth: true
- Layout.fillHeight: true
}
}
diff --git a/resources/qml/dialogs/RoomMembers.qml b/resources/qml/dialogs/RoomMembers.qml
index 6750ed81..37ab6a80 100644
--- a/resources/qml/dialogs/RoomMembers.qml
+++ b/resources/qml/dialogs/RoomMembers.qml
@@ -100,8 +100,8 @@ ApplicationWindow {
id: memberLayout
spacing: Nheko.paddingMedium
- anchors.verticalCenter: parent.verticalCenter
- x: parent.x + Nheko.paddingSmall
+ anchors.centerIn: parent
+ width: parent.width - Nheko.paddingSmall * 2
Avatar {
id: avatar
@@ -119,23 +119,22 @@ ApplicationWindow {
ElidedLabel {
fullText: model.displayName
- color: TimelineManager.userColor(model ? model.mxid : "", Nheko.colors.window)
+ color: TimelineManager.userColor(model ? model.mxid : "", del.background.color)
font.pixelSize: fontMetrics.font.pixelSize
elideWidth: del.width - Nheko.paddingMedium * 2 - avatar.width - encryptInd.width
}
ElidedLabel {
fullText: model.mxid
- color: Nheko.colors.buttonText
+ color: del.hovered ? Nheko.colors.brightText : Nheko.colors.buttonText
font.pixelSize: Math.ceil(fontMetrics.font.pixelSize * 0.9)
elideWidth: del.width - Nheko.paddingMedium * 2 - avatar.width - encryptInd.width
}
- Item {
- Layout.fillHeight: true
- Layout.fillWidth: true
- }
+ }
+ Item {
+ Layout.fillWidth: true
}
EncryptionIndicator {
|