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
7f2ae13c
Verified
Commit
7f2ae13c
authored
2 years ago
by
Joe Donofry
Browse files
Options
Downloads
Patches
Plain Diff
Make PrivacyScreen work on Popped-out Rooms
parent
d130c961
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#3140
passed
2 years ago
Stage: build
Stage: deploy
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
resources/qml/ChatPage.qml
+1
-0
1 addition, 0 deletions
resources/qml/ChatPage.qml
resources/qml/PrivacyScreen.qml
+5
-3
5 additions, 3 deletions
resources/qml/PrivacyScreen.qml
resources/qml/RoomList.qml
+9
-0
9 additions, 0 deletions
resources/qml/RoomList.qml
with
15 additions
and
3 deletions
resources/qml/ChatPage.qml
+
1
−
0
View file @
7f2ae13c
...
...
@@ -143,6 +143,7 @@ Rectangle {
visible
:
Settings
.
privacyScreen
screenTimeout
:
Settings
.
privacyScreenTimeout
timelineRoot
:
adaptiveView
windowTarget
:
MainWindow
}
}
This diff is collapsed.
Click to expand it.
resources/qml/PrivacyScreen.qml
+
5
−
3
View file @
7f2ae13c
...
...
@@ -14,9 +14,11 @@ Item {
property
var
timelineRoot
property
int
screenTimeout
required
property
var
windowTarget
Connections
{
function
onActiveChanged
()
{
if
(
MainWindow
.
active
)
{
if
(
windowTarget
.
active
)
{
screenSaverTimer
.
stop
();
screenSaver
.
state
=
"
Invisible
"
;
}
else
{
...
...
@@ -26,14 +28,14 @@ Item {
}
}
target
:
MainWindow
target
:
windowTarget
}
Timer
{
id
:
screenSaverTimer
interval
:
screenTimeout
*
1000
running
:
!
MainWindow
.
active
running
:
!
windowTarget
.
active
onTriggered
:
{
screenSaver
.
state
=
"
Visible
"
;
}
...
...
This diff is collapsed.
Click to expand it.
resources/qml/RoomList.qml
+
9
−
0
View file @
7f2ae13c
...
...
@@ -92,10 +92,19 @@ Page {
}
TimelineView
{
id
:
timelineView
anchors.fill
:
parent
room
:
roomWindowW
.
room
roomPreview
:
roomWindowW
.
roomPreview
.
roomid
?
roomWindowW
.
roomPreview
:
null
}
PrivacyScreen
{
anchors.fill
:
parent
visible
:
Settings
.
privacyScreen
screenTimeout
:
Settings
.
privacyScreenTimeout
timelineRoot
:
timelineView
windowTarget
:
roomWindowW
}
}
}
...
...
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