Skip to content
Snippets Groups Projects
Commit 5a48bccd authored by Sébastien Blin's avatar Sébastien Blin
Browse files

swarmdetailspanel: some ui fixes 

Change-Id: I6c00b128284e5b86de7905aca9cb548523dfc3b0
GitLab: #1072
parent d4b3048e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/app/constant/JamiTheme.qml
+ 0
− 1
View file @ 5a48bccd
...@@ -307,7 +307,6 @@ Item { ...@@ -307,7 +307,6 @@ Item {
property real buttonFontSize: calcSize(9) property real buttonFontSize: calcSize(9)
property real materialButtonPreferredHeight: calcSize(36) property real materialButtonPreferredHeight: calcSize(36)
property real participantFontSize: calcSize(10 + fontSizeOffset) property real participantFontSize: calcSize(10 + fontSizeOffset)
property real participantSwarmDetailFontSize: calcSize(15 + fontSizeOffset)
property real menuFontSize: calcSize(12 + fontSizeOffset) property real menuFontSize: calcSize(12 + fontSizeOffset)
property real headerFontSize: calcSize(14.25 + fontSizeOffset) property real headerFontSize: calcSize(14.25 + fontSizeOffset)
property real titleFontSize: calcSize(16 + fontSizeOffset) property real titleFontSize: calcSize(16 + fontSizeOffset)
......
src/app/mainview/components/SwarmDetailsPanel.qml
+ 10
− 13
View file @ 5a48bccd
...@@ -64,11 +64,10 @@ Rectangle { ...@@ -64,11 +64,10 @@ Rectangle {
newItem: true newItem: true
imageId: LRCInstance.selectedConvUid imageId: LRCInstance.selectedConvUid
avatarSize: JamiTheme.smartListAvatarSize * 3 / 2 avatarSize: JamiTheme.smartListAvatarSize
} }
ColumnLayout { ColumnLayout {
signal accepted signal accepted
ModalTextEdit { ModalTextEdit {
...@@ -79,15 +78,14 @@ Rectangle { ...@@ -79,15 +78,14 @@ Rectangle {
text: CurrentConversation.title text: CurrentConversation.title
elide: Text.ElideRight elide: Text.ElideRight
elideWidth: titleLine.width elideWidth: titleLine.width
font.pixelSize: JamiTheme.materialLineEditPixelSize
} }
maxCharacters: JamiTheme.maximumCharacters maxCharacters: JamiTheme.maximumCharacters
fontPixelSize: JamiTheme.materialLineEditPixelSize
isSwarmDetail: true isSwarmDetail: true
readOnly: !isAdmin readOnly: !isAdmin
Layout.minimumHeight: JamiTheme.preferredFieldHeight
Layout.preferredWidth: Math.min(217, swarmProfileDetails.width - currentAccountAvatar.width - 30 - JamiTheme.settingsMarginSize) Layout.preferredWidth: Math.min(217, swarmProfileDetails.width - currentAccountAvatar.width - 30 - JamiTheme.settingsMarginSize)
staticText: CurrentConversation.title staticText: CurrentConversation.title
...@@ -121,16 +119,15 @@ Rectangle { ...@@ -121,16 +119,15 @@ Rectangle {
text: CurrentConversation.description text: CurrentConversation.description
elide: Text.ElideRight elide: Text.ElideRight
elideWidth: descriptionLineButton.width elideWidth: descriptionLineButton.width
font.pixelSize: JamiTheme.materialLineEditPixelSize
} }
maxCharacters: JamiTheme.maximumCharacters maxCharacters: JamiTheme.maximumCharacters
fontPixelSize: JamiTheme.materialLineEditSelectedPixelSize
isSwarmDetail: true isSwarmDetail: true
readOnly: !isAdmin || CurrentConversation.isCoreDialog readOnly: !isAdmin || CurrentConversation.isCoreDialog
Layout.minimumHeight: JamiTheme.preferredFieldHeight
Layout.preferredWidth: Math.min(217, swarmProfileDetails.width - currentAccountAvatar.width - 30 - JamiTheme.settingsMarginSize) Layout.preferredWidth: Math.min(217, swarmProfileDetails.width - currentAccountAvatar.width - 30 - JamiTheme.settingsMarginSize)
staticText: CurrentConversation.description staticText: CurrentConversation.description
...@@ -286,7 +283,7 @@ Rectangle { ...@@ -286,7 +283,7 @@ Rectangle {
anchors.top: parent.top anchors.top: parent.top
anchors.margins: JamiTheme.preferredMarginSize anchors.margins: JamiTheme.preferredMarginSize
text: JamiStrings.leaveConversation text: JamiStrings.leaveConversation
font.pixelSize: JamiTheme.participantSwarmDetailFontSize font.pixelSize: JamiTheme.settingsDescriptionPixelSize
font.kerning: true font.kerning: true
elide: Text.ElideRight elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
...@@ -327,7 +324,7 @@ Rectangle { ...@@ -327,7 +324,7 @@ Rectangle {
Layout.rightMargin: JamiTheme.preferredMarginSize Layout.rightMargin: JamiTheme.preferredMarginSize
text: JamiStrings.chooseAColor text: JamiStrings.chooseAColor
font.pixelSize: JamiTheme.participantSwarmDetailFontSize font.pixelSize: JamiTheme.settingsDescriptionPixelSize
font.kerning: true font.kerning: true
elide: Text.ElideRight elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
...@@ -377,7 +374,7 @@ Rectangle { ...@@ -377,7 +374,7 @@ Rectangle {
Layout.maximumWidth: settingsSwarmItem.width / 2 Layout.maximumWidth: settingsSwarmItem.width / 2
text: JamiStrings.defaultCallHost text: JamiStrings.defaultCallHost
font.pixelSize: JamiTheme.participantSwarmDetailFontSize font.pixelSize: JamiTheme.settingsDescriptionPixelSize
font.kerning: true font.kerning: true
elide: Text.ElideRight elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
...@@ -481,7 +478,7 @@ Rectangle { ...@@ -481,7 +478,7 @@ Rectangle {
Layout.rightMargin: JamiTheme.preferredMarginSize Layout.rightMargin: JamiTheme.preferredMarginSize
text: JamiStrings.typeOfSwarm text: JamiStrings.typeOfSwarm
font.pixelSize: JamiTheme.participantSwarmDetailFontSize font.pixelSize: JamiTheme.settingsDescriptionPixelSize
font.kerning: true font.kerning: true
elide: Text.ElideRight elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
...@@ -497,7 +494,7 @@ Rectangle { ...@@ -497,7 +494,7 @@ Rectangle {
Layout.rightMargin: JamiTheme.preferredMarginSize Layout.rightMargin: JamiTheme.preferredMarginSize
color: JamiTheme.textColor color: JamiTheme.textColor
font.pixelSize: JamiTheme.participantSwarmDetailFontSize font.pixelSize: JamiTheme.settingsDescriptionPixelSize
font.weight: Font.Medium font.weight: Font.Medium
text: CurrentConversation.modeString text: CurrentConversation.modeString
} }
...@@ -516,7 +513,7 @@ Rectangle { ...@@ -516,7 +513,7 @@ Rectangle {
Layout.maximumWidth: parent.width / 2 Layout.maximumWidth: parent.width / 2
text: JamiStrings.identifier text: JamiStrings.identifier
font.pixelSize: JamiTheme.participantSwarmDetailFontSize font.pixelSize: JamiTheme.settingsDescriptionPixelSize
font.kerning: true font.kerning: true
elide: Text.ElideRight elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
...@@ -532,7 +529,7 @@ Rectangle { ...@@ -532,7 +529,7 @@ Rectangle {
Layout.maximumWidth: parent.width / 2 Layout.maximumWidth: parent.width / 2
color: JamiTheme.textColor color: JamiTheme.textColor
font.pixelSize: JamiTheme.participantSwarmDetailFontSize font.pixelSize: JamiTheme.settingsDescriptionPixelSize
text: CurrentConversation.id text: CurrentConversation.id
elide: Text.ElideRight elide: Text.ElideRight
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment