Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nheko
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
Container 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
Nheko Reborn
nheko
Commits
43c8e64e
Verified
Commit
43c8e64e
authored
1 year ago
by
Nicolas Werner
Browse files
Options
Downloads
Patches
Plain Diff
Fix alignment of file messages and redactions
parent
e96b5529
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
resources/qml/MessageView.qml
+5
-0
5 additions, 0 deletions
resources/qml/MessageView.qml
resources/qml/TimelineEvent.qml
+2
-3
2 additions, 3 deletions
resources/qml/TimelineEvent.qml
resources/qml/delegates/ImageMessage.qml
+5
-4
5 additions, 4 deletions
resources/qml/delegates/ImageMessage.qml
with
12 additions
and
7 deletions
resources/qml/MessageView.qml
+
5
−
0
View file @
43c8e64e
...
...
@@ -216,6 +216,11 @@ Item {
]
}
Item
{
// spacer to fill width if needed
Layout.fillWidth
:
true
}
RowLayout
{
id
:
metadata
...
...
This diff is collapsed.
Click to expand it.
resources/qml/TimelineEvent.qml
+
2
−
3
View file @
43c8e64e
...
...
@@ -141,8 +141,8 @@ EventDelegateChooser {
required
property
string
userName
Layout.fillWidth
:
true
Layout.maximumWidth
:
tempWidth
Layout.maximumHeight
:
timelineView
.
height
/
8
//
Layout.maximumWidth: tempWidth
//
Layout.maximumHeight: timelineView.height / 8
containerHeight
:
timelineView
.
height
}
}
...
...
@@ -181,7 +181,6 @@ EventDelegateChooser {
EncryptionEnabled
{
required
property
string
userId
required
property
string
userName
Layout.fillWidth
:
true
}
...
...
This diff is collapsed.
Click to expand it.
resources/qml/delegates/ImageMessage.qml
+
5
−
4
View file @
43c8e64e
...
...
@@ -11,6 +11,7 @@ import im.nheko
AbstractButton
{
required
property
int
type
required
property
int
originalWidth
required
property
int
originalHeight
required
property
double
proportionalHeight
required
property
string
url
required
property
string
blurhash
...
...
@@ -21,10 +22,10 @@ AbstractButton {
required
property
int
containerHeight
property
double
divisor
:
isReply
?
5
:
3
property
int
temp
Width
:
originalWidth
<
1
?
400
:
originalWidth
Layout.preferredWidth
:
Math
.
round
(
tempWidth
*
Math
.
min
((
containerHeight
/
divisor
)
/
(
tempWidth
*
proportionalHeight
),
1
))
Layout.preferred
Height
:
width
*
proportionalHeight
//Layout.maximum
Width: originalWidth
Layout.maximumHeight
:
Math
.
min
(
originalHeight
,
containerHeight
/
divisor
)
implicitWidth
:
height
/
proportionalHeight
implicitHeight
:
Math
.
min
(
Layout
.
maximum
Height
,
width
*
proportionalHeight
)
hoverEnabled
:
true
state
:
(
img
.
status
!=
Image
.
Ready
||
timeline
.
privacyScreen
.
active
)
?
"
BlurhashVisible
"
:
"
ImageVisible
"
...
...
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