Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Multimedia
Elisa
Commits
b3893b51
Commit
b3893b51
authored
Nov 10, 2020
by
Nate Graham
🔩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't allow view's loading indicator and placeholder message to overlap
BUG: 424918 FIXED-IN: 20.12
parent
5b0915d9
Pipeline
#40469
canceled with stage
Changes
4
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
2 deletions
+9
-2
src/qml/DataGridView.qml
src/qml/DataGridView.qml
+2
-0
src/qml/DataListView.qml
src/qml/DataListView.qml
+3
-0
src/qml/GridBrowserView.qml
src/qml/GridBrowserView.qml
+2
-1
src/qml/ListBrowserView.qml
src/qml/ListBrowserView.qml
+2
-1
No files found.
src/qml/DataGridView.qml
View file @
b3893b51
...
...
@@ -91,6 +91,8 @@ FocusScope {
onOpen
:
viewManager
.
openChildView
(
fullData
)
suppressNoDataPlaceholderMessage
:
busyIndicatorLoader
.
active
onGoBackRequested
:
{
viewManager
.
goBack
()
}
...
...
src/qml/DataListView.qml
View file @
b3893b51
...
...
@@ -221,7 +221,10 @@ FocusScope {
onGoBackRequested
:
viewManager
.
goBack
()
suppressNoDataPlaceholderMessage
:
busyIndicatorLoader
.
active
Loader
{
id
:
busyIndicatorLoader
anchors.centerIn
:
parent
height
:
Kirigami
.
Units
.
gridUnit
*
5
width
:
height
...
...
src/qml/GridBrowserView.qml
View file @
b3893b51
...
...
@@ -34,6 +34,7 @@ FocusScope {
property
url
defaultIcon
property
int
depth
:
1
property
alias
viewManager
:
navigationBar
.
viewManager
property
bool
suppressNoDataPlaceholderMessage
:
false
signal
enqueue
(
var
fullData
,
string
name
)
signal
replaceAndPlay
(
var
fullData
,
string
name
)
...
...
@@ -208,7 +209,7 @@ FocusScope {
Kirigami.PlaceholderMessage
{
anchors.centerIn
:
parent
width
:
parent
.
width
-
(
Kirigami
.
Units
.
largeSpacing
*
4
)
visible
:
contentDirectoryView
.
count
===
0
visible
:
contentDirectoryView
.
count
===
0
&&
!
suppressNoDataPlaceholderMessage
text
:
i18n
(
"
Nothing to display
"
)
}
...
...
src/qml/ListBrowserView.qml
View file @
b3893b51
...
...
@@ -42,6 +42,7 @@ FocusScope {
property
alias
navigationBar
:
navigationBar
property
int
depth
:
1
property
alias
viewManager
:
navigationBar
.
viewManager
property
bool
suppressNoDataPlaceholderMessage
:
false
signal
goBackRequested
()
signal
showArtist
(
var
name
)
...
...
@@ -181,7 +182,7 @@ FocusScope {
Kirigami.PlaceholderMessage
{
anchors.centerIn
:
parent
width
:
parent
.
width
-
(
Kirigami
.
Units
.
largeSpacing
*
4
)
visible
:
contentDirectoryView
.
count
===
0
visible
:
contentDirectoryView
.
count
===
0
&&
!
suppressNoDataPlaceholderMessage
text
:
i18n
(
"
Nothing to display
"
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment