Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-qt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-qt
Commits
719e3af4
Commit
719e3af4
authored
2 years ago
by
Aline Gondim Santos
Committed by
Sébastien Blin
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
swarmdetailspanel: elide text when too long for text area
GitLab:
#900
Change-Id: Icb161a60de9e09a7d9bcc0980f709bdc20a58b98
parent
eae071a1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app/commoncomponents/EditableLineEdit.qml
+4
-3
4 additions, 3 deletions
src/app/commoncomponents/EditableLineEdit.qml
src/app/mainview/components/SwarmDetailsPanel.qml
+24
-3
24 additions, 3 deletions
src/app/mainview/components/SwarmDetailsPanel.qml
with
28 additions
and
6 deletions
src/app/commoncomponents/EditableLineEdit.qml
+
4
−
3
View file @
719e3af4
...
...
@@ -167,9 +167,9 @@ Item {
verticalAlignment
:
Text
.
AlignBottom
borderColor
:
root
.
editIconColor
placeholderText
:
readOnly
?
root
.
placeholderText
:
""
placeholderText
:
readOnly
?
root
.
placeholderText
:
""
wrapMode
:
readOnly
?
TextEdit
.
WrapAnywhere
:
TextEdit
.
NoWrap
wrapMode
:
readOnly
?
TextEdit
.
WrapAnywhere
:
TextEdit
.
NoWrap
horizontalAlignment
:
!
readOnly
||
text
!==
""
?
Qt
.
AlignLeft
:
Qt
.
AlignHCenter
onFocusChanged
:
function
(
focus
)
{
...
...
@@ -183,10 +183,11 @@ Item {
lineEdit
.
forceActiveFocus
()
}
}
onAccepted
:
{
editable
=
!
editable
root
.
accepted
()
root
.
editingFinished
()
editable
=
!
editable
focus
=
false
}
}
...
...
This diff is collapsed.
Click to expand it.
src/app/mainview/components/SwarmDetailsPanel.qml
+
24
−
3
View file @
719e3af4
...
...
@@ -72,7 +72,18 @@ Rectangle {
Layout.alignment
:
Qt
.
AlignHCenter
Layout.preferredWidth
:
JamiTheme
.
preferredFieldWidth
Layout.topMargin
:
5
TextMetrics
{
id
:
formattedTitle
font.pointSize
:
JamiTheme
.
titleFontSize
elide
:
!
titleLine
.
editable
?
Text
.
ElideRight
:
Text
.
ElideNone
elideWidth
:
titleLine
.
lineEdit
.
width
-
25
text
:
CurrentConversation
.
title
}
wrapMode
:
Text
.
NoWrap
font.pointSize
:
JamiTheme
.
titleFontSize
horizontalAlignment
:
Text
.
AlignHCenter
...
...
@@ -84,7 +95,7 @@ Rectangle {
fontSize
:
20
borderColor
:
"
transparent
"
text
:
CurrentConversation
.
title
text
:
formattedTitle
.
elidedText
readOnly
:
!
root
.
isAdmin
placeholderText
:
JamiStrings
.
swarmName
placeholderTextColor
:
{
...
...
@@ -113,7 +124,6 @@ Rectangle {
ConversationsAdapter
.
updateConversationTitle
(
LRCInstance
.
selectedConvUid
,
text
)
}
onSecondIcoClicked
:
{
editable
=
!
editable
}
}
EditableLineEdit
{
...
...
@@ -133,7 +143,18 @@ Rectangle {
secondIco
:
editable
?
JamiResources
.
close_black_24dp_svg
:
""
borderColor
:
"
transparent
"
text
:
CurrentConversation
.
description
TextMetrics
{
id
:
formattedDescription
font.pointSize
:
JamiTheme
.
titleFontSize
elide
:
!
descriptionLine
.
editable
?
Text
.
ElideRight
:
Text
.
ElideNone
elideWidth
:
descriptionLine
.
lineEdit
.
width
-
25
text
:
CurrentConversation
.
description
}
wrapMode
:
Text
.
NoWrap
text
:
formattedDescription
.
elidedText
readOnly
:
!
root
.
isAdmin
visible
:
root
.
isAdmin
||
text
.
length
>
0
placeholderText
:
JamiStrings
.
addADescription
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment