From 5a48bccd25ab0a99605198d5cac061645c919b8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Fri, 26 May 2023 15:43:07 -0400
Subject: [PATCH] swarmdetailspanel: some ui fixes
Change-Id: I6c00b128284e5b86de7905aca9cb548523dfc3b0
GitLab: #1072
---
src/app/constant/JamiTheme.qml | 1 -
.../mainview/components/SwarmDetailsPanel.qml | 23 ++++++++-----------
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/src/app/constant/JamiTheme.qml b/src/app/constant/JamiTheme.qml
index 8e4519338..40cdd3fb4 100644
--- a/src/app/constant/JamiTheme.qml
+++ b/src/app/constant/JamiTheme.qml
@@ -307,7 +307,6 @@ Item {
property real buttonFontSize: calcSize(9)
property real materialButtonPreferredHeight: calcSize(36)
property real participantFontSize: calcSize(10 + fontSizeOffset)
- property real participantSwarmDetailFontSize: calcSize(15 + fontSizeOffset)
property real menuFontSize: calcSize(12 + fontSizeOffset)
property real headerFontSize: calcSize(14.25 + fontSizeOffset)
property real titleFontSize: calcSize(16 + fontSizeOffset)
diff --git a/src/app/mainview/components/SwarmDetailsPanel.qml b/src/app/mainview/components/SwarmDetailsPanel.qml
index 01662f14e..d2a48801e 100644
--- a/src/app/mainview/components/SwarmDetailsPanel.qml
+++ b/src/app/mainview/components/SwarmDetailsPanel.qml
@@ -64,11 +64,10 @@ Rectangle {
newItem: true
imageId: LRCInstance.selectedConvUid
- avatarSize: JamiTheme.smartListAvatarSize * 3 / 2
+ avatarSize: JamiTheme.smartListAvatarSize
}
ColumnLayout {
-
signal accepted
ModalTextEdit {
@@ -79,15 +78,14 @@ Rectangle {
text: CurrentConversation.title
elide: Text.ElideRight
elideWidth: titleLine.width
- font.pixelSize: JamiTheme.materialLineEditPixelSize
}
maxCharacters: JamiTheme.maximumCharacters
+ fontPixelSize: JamiTheme.materialLineEditPixelSize
isSwarmDetail: true
readOnly: !isAdmin
- Layout.minimumHeight: JamiTheme.preferredFieldHeight
Layout.preferredWidth: Math.min(217, swarmProfileDetails.width - currentAccountAvatar.width - 30 - JamiTheme.settingsMarginSize)
staticText: CurrentConversation.title
@@ -121,16 +119,15 @@ Rectangle {
text: CurrentConversation.description
elide: Text.ElideRight
elideWidth: descriptionLineButton.width
- font.pixelSize: JamiTheme.materialLineEditPixelSize
}
maxCharacters: JamiTheme.maximumCharacters
+ fontPixelSize: JamiTheme.materialLineEditSelectedPixelSize
isSwarmDetail: true
readOnly: !isAdmin || CurrentConversation.isCoreDialog
- Layout.minimumHeight: JamiTheme.preferredFieldHeight
Layout.preferredWidth: Math.min(217, swarmProfileDetails.width - currentAccountAvatar.width - 30 - JamiTheme.settingsMarginSize)
staticText: CurrentConversation.description
@@ -286,7 +283,7 @@ Rectangle {
anchors.top: parent.top
anchors.margins: JamiTheme.preferredMarginSize
text: JamiStrings.leaveConversation
- font.pixelSize: JamiTheme.participantSwarmDetailFontSize
+ font.pixelSize: JamiTheme.settingsDescriptionPixelSize
font.kerning: true
elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft
@@ -327,7 +324,7 @@ Rectangle {
Layout.rightMargin: JamiTheme.preferredMarginSize
text: JamiStrings.chooseAColor
- font.pixelSize: JamiTheme.participantSwarmDetailFontSize
+ font.pixelSize: JamiTheme.settingsDescriptionPixelSize
font.kerning: true
elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft
@@ -377,7 +374,7 @@ Rectangle {
Layout.maximumWidth: settingsSwarmItem.width / 2
text: JamiStrings.defaultCallHost
- font.pixelSize: JamiTheme.participantSwarmDetailFontSize
+ font.pixelSize: JamiTheme.settingsDescriptionPixelSize
font.kerning: true
elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft
@@ -481,7 +478,7 @@ Rectangle {
Layout.rightMargin: JamiTheme.preferredMarginSize
text: JamiStrings.typeOfSwarm
- font.pixelSize: JamiTheme.participantSwarmDetailFontSize
+ font.pixelSize: JamiTheme.settingsDescriptionPixelSize
font.kerning: true
elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft
@@ -497,7 +494,7 @@ Rectangle {
Layout.rightMargin: JamiTheme.preferredMarginSize
color: JamiTheme.textColor
- font.pixelSize: JamiTheme.participantSwarmDetailFontSize
+ font.pixelSize: JamiTheme.settingsDescriptionPixelSize
font.weight: Font.Medium
text: CurrentConversation.modeString
}
@@ -516,7 +513,7 @@ Rectangle {
Layout.maximumWidth: parent.width / 2
text: JamiStrings.identifier
- font.pixelSize: JamiTheme.participantSwarmDetailFontSize
+ font.pixelSize: JamiTheme.settingsDescriptionPixelSize
font.kerning: true
elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft
@@ -532,7 +529,7 @@ Rectangle {
Layout.maximumWidth: parent.width / 2
color: JamiTheme.textColor
- font.pixelSize: JamiTheme.participantSwarmDetailFontSize
+ font.pixelSize: JamiTheme.settingsDescriptionPixelSize
text: CurrentConversation.id
elide: Text.ElideRight
--
GitLab