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
4a7e6d3f
Commit
4a7e6d3f
authored
3 years ago
by
Loren Burkholder
Browse files
Options
Downloads
Patches
Plain Diff
Fix a few things
parent
6e7e22b0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#2292
passed
3 years ago
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
resources/qml/RoomList.qml
+2
-14
2 additions, 14 deletions
resources/qml/RoomList.qml
resources/qml/delegates/Encrypted.qml
+2
-2
2 additions, 2 deletions
resources/qml/delegates/Encrypted.qml
with
4 additions
and
16 deletions
resources/qml/RoomList.qml
+
2
−
14
View file @
4a7e6d3f
...
...
@@ -31,7 +31,7 @@ Page {
anchors.right
:
parent
.
right
height
:
parent
.
height
model
:
Rooms
reuseItems
:
fals
e
reuseItems
:
tru
e
ScrollHelper
{
flickable
:
parent
...
...
@@ -139,7 +139,7 @@ Page {
height
:
avatarSize
+
2
*
Nheko
.
paddingMedium
width
:
ListView
.
view
.
width
state
:
"
normal
"
ToolTip.visible
:
hovered
&&
collapsed
&&
!
collapsedBubbleHover
.
hovered
&&
!
notificationBubbleHover
.
hovered
ToolTip.visible
:
hovered
&&
collapsed
ToolTip.text
:
roomName
onClicked
:
{
console
.
log
(
"
tapped
"
+
roomId
);
...
...
@@ -239,8 +239,6 @@ Page {
width
:
Math
.
min
(
Math
.
max
(
collapsedBubbleText
.
width
+
Nheko
.
paddingMedium
,
height
),
parent
.
width
)
radius
:
height
/
2
color
:
hasLoudNotification
?
Nheko
.
theme
.
red
:
roomItem
.
bubbleBackground
ToolTip.text
:
notificationCount
ToolTip.visible
:
collapsedBubbleHover
.
hovered
&&
(
notificationCount
>
9999
)
Label
{
id
:
collapsedBubbleText
...
...
@@ -255,10 +253,6 @@ Page {
text
:
notificationCount
>
9999
?
"
9999+
"
:
notificationCount
}
HoverHandler
{
id
:
collapsedBubbleHover
}
}
}
...
...
@@ -345,12 +339,6 @@ Page {
color
:
hasLoudNotification
?
"
white
"
:
roomItem
.
bubbleText
text
:
notificationCount
>
9999
?
"
9999+
"
:
notificationCount
onTextChanged
:
{
let
old
=
parent
.
width
parent
.
width
=
Math
.
max
(
probableWidth
+
Nheko
.
paddingMedium
,
parent
.
height
)
console
.
log
(
old
+
"
changed to
"
+
parent
.
width
)
}
HoverHandler
{
id
:
notificationBubbleHover
}
...
...
This diff is collapsed.
Click to expand it.
resources/qml/delegates/Encrypted.qml
+
2
−
2
View file @
4a7e6d3f
...
...
@@ -14,7 +14,7 @@ Rectangle {
required
property
int
encryptionError
required
property
string
eventId
radius
:
fontMetrics
.
xHeight
+
Nheko
.
paddingMedium
radius
:
fontMetrics
.
lineSpacing
/
2
+
Nheko
.
paddingMedium
width
:
parent
?
parent
.
width
:
undefined
height
:
contents
.
implicitHeight
+
Nheko
.
paddingMedium
*
2
color
:
Nheko
.
colors
.
alternateBase
...
...
@@ -56,7 +56,7 @@ Rectangle {
return
qsTr
(
"
Unknown decryption error
"
);
}
}
color
:
Nheko
.
colors
.
buttonT
ext
color
:
Nheko
.
colors
.
t
ext
width
:
parent
?
parent
.
width
:
undefined
}
...
...
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