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
ded926cd
Verified
Commit
ded926cd
authored
3 years ago
by
Nicolas Werner
Browse files
Options
Downloads
Patches
Plain Diff
Fix a few null warnings
parent
fc7df50d
No related branches found
No related tags found
No related merge requests found
Pipeline
#1676
passed
3 years ago
Stage: build
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
resources/qml/MessageView.qml
+5
-5
5 additions, 5 deletions
resources/qml/MessageView.qml
resources/qml/TimelineView.qml
+4
-5
4 additions, 5 deletions
resources/qml/TimelineView.qml
resources/qml/dialogs/ImagePackEditorDialog.qml
+0
-1
0 additions, 1 deletion
resources/qml/dialogs/ImagePackEditorDialog.qml
with
9 additions
and
11 deletions
resources/qml/MessageView.qml
+
5
−
5
View file @
ded926cd
...
...
@@ -33,7 +33,7 @@ ScrollView {
verticalLayoutDirection
:
ListView
.
BottomToTop
onCountChanged
:
{
// Mark timeline as read
if
(
atYEnd
)
if
(
atYEnd
&&
room
)
model
.
currentIndex
=
0
;
}
...
...
@@ -233,8 +233,8 @@ ScrollView {
id
:
dateBubble
anchors.horizontalCenter
:
parent
?
parent
.
horizontalCenter
:
undefined
visible
:
previousMessageDay
!==
day
text
:
chat
.
model
.
formatDateSeparator
(
timestamp
)
visible
:
room
&&
previousMessageDay
!==
day
text
:
room
?
room
.
formatDateSeparator
(
timestamp
)
:
""
color
:
Nheko
.
colors
.
text
height
:
Math
.
round
(
fontMetrics
.
height
*
1.4
)
width
:
contentWidth
*
1.2
...
...
@@ -257,10 +257,10 @@ ScrollView {
width
:
Nheko
.
avatarSize
height
:
Nheko
.
avatarSize
url
:
chat
.
model
.
avatarUrl
(
userId
).
replace
(
"
mxc://
"
,
"
image://MxcImage/
"
)
url
:
!
room
?
""
:
room
.
avatarUrl
(
userId
).
replace
(
"
mxc://
"
,
"
image://MxcImage/
"
)
displayName
:
userName
userid
:
userId
onClicked
:
chat
.
model
.
openUserProfile
(
userId
)
onClicked
:
room
.
openUserProfile
(
userId
)
ToolTip.visible
:
avatarHover
.
hovered
ToolTip.text
:
userid
...
...
This diff is collapsed.
Click to expand it.
resources/qml/TimelineView.qml
+
4
−
5
View file @
ded926cd
...
...
@@ -84,11 +84,10 @@ Item {
target
:
timelineView
}
MessageView
{
implicitHeight
:
msgView
.
height
-
typingIndicator
.
height
Layout.fillWidth
:
true
}
MessageView
{
implicitHeight
:
msgView
.
height
-
typingIndicator
.
height
Layout.fillWidth
:
true
}
Loader
{
source
:
CallManager
.
isOnCall
&&
CallManager
.
callType
!=
CallType
.
VOICE
?
"
voip/VideoCall.qml
"
:
""
...
...
This diff is collapsed.
Click to expand it.
resources/qml/dialogs/ImagePackEditorDialog.qml
+
0
−
1
View file @
ded926cd
...
...
@@ -279,7 +279,6 @@ ApplicationWindow {
Layout.alignment
:
Qt
.
AlignRight
}
Item
{
Layout.columnSpan
:
2
Layout.fillHeight
:
true
...
...
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