rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix colors and alignment in dialogs

This commit is contained in:
Nicolas Werner 2021-11-18 22:33:45 +01:00
parent 7be659af46
commit 57fb0d79f9
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
5 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
resources/qml/dialogs/InviteDialog.qml
View File

@ -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 {

5
resources/qml/dialogs/ReadReceipts.qml
View File

@ -102,15 +102,10 @@ ApplicationWindow {
font.pointSize: fontMetrics.font.pointSize * 0.9
}
Item {
Layout.fillWidth: true
}
}
Item {
Layout.fillWidth: true
Layout.fillHeight: true
}
}

15
resources/qml/dialogs/RoomMembers.qml
View File

@ -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 {

7
src/timeline/TimelineViewManager.cpp
View File

@ -116,9 +116,10 @@ TimelineViewManager::updateColorPalette()
QColor
TimelineViewManager::userColor(QString id, QColor background)
{
if (!userColors.contains(id))
userColors.insert(id, QColor(utils::generateContrastingHexColor(id, background)));
return userColors.value(id);
QPair<QString, quint64> idx{id, background.rgba64()};
if (!userColors.contains(idx))
userColors.insert(idx, QColor(utils::generateContrastingHexColor(id, background)));
return userColors.value(idx);
}
QString

2
src/timeline/TimelineViewManager.h
View File

@ -147,7 +147,7 @@ private:
CallManager *callManager_ = nullptr;
VerificationManager *verificationManager_ = nullptr;
QHash<QString, QColor> userColors;
QHash<QPair<QString, quint64>, QColor> userColors;
};
Q_DECLARE_METATYPE(mtx::events::msg::KeyVerificationAccept)
Q_DECLARE_METATYPE(mtx::events::msg::KeyVerificationCancel)