Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Q
qtquickcontrols-nemo
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
NemoMobile
qtquickcontrols-nemo
Commits
664ca7fa
Commit
664ca7fa
authored
Dec 29, 2017
by
Sergey Chupligin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ScrollDecorator] add ScrollDecorator
parent
8c5339a4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
61 additions
and
17 deletions
+61
-17
glacier-components.qml
examples/touch/glacier-components.qml
+5
-0
controls.pro
src/controls/controls.pro
+1
-0
ListView.qml
src/controls/qml/ListView.qml
+0
-17
ScrollDecorator.qml
src/controls/qml/ScrollDecorator.qml
+54
-0
qmldir
src/controls/qml/qmldir
+1
-0
No files found.
examples/touch/glacier-components.qml
View file @
664ca7fa
...
@@ -228,6 +228,7 @@ ApplicationWindow {
...
@@ -228,6 +228,7 @@ ApplicationWindow {
}
}
ListView
{
ListView
{
id
:
mainList
model
:
pageModel
model
:
pageModel
anchors.fill
:
parent
anchors.fill
:
parent
clip
:
true
clip
:
true
...
@@ -236,6 +237,10 @@ ApplicationWindow {
...
@@ -236,6 +237,10 @@ ApplicationWindow {
label
:
title
label
:
title
onClicked
:
pageItem
.
Stack
.
view
.
push
(
Qt
.
resolvedUrl
(
page
))
onClicked
:
pageItem
.
Stack
.
view
.
push
(
Qt
.
resolvedUrl
(
page
))
}
}
ScrollDecorator
{
flickable
:
mainList
}
}
}
}
}
}
}
src/controls/controls.pro
View file @
664ca7fa
...
@@ -25,6 +25,7 @@ QML_FILES += \
...
@@ -25,6 +25,7 @@ QML_FILES += \
qml
/
InverseMouseArea
.
qml
\
qml
/
InverseMouseArea
.
qml
\
qml
/
IconButton
.
qml
\
qml
/
IconButton
.
qml
\
qml
/
DatePicker
.
qml
\
qml
/
DatePicker
.
qml
\
qml
/
ScrollDecorator
.
qml
\
qml
/
dialogs
/
QueryDialog
.
qml
qml
/
dialogs
/
QueryDialog
.
qml
OTHER_FILES
+=
qmldir
\
OTHER_FILES
+=
qmldir
\
...
...
src/controls/qml/ListView.qml
View file @
664ca7fa
...
@@ -8,10 +8,8 @@ ListView {
...
@@ -8,10 +8,8 @@ ListView {
signal
hideAllActions
(
int
hideIndex
)
signal
hideAllActions
(
int
hideIndex
)
property
bool
showDecorator
:
false
property
color
delegateColor
:
Theme
.
backgroundColor
property
color
delegateColor
:
Theme
.
backgroundColor
property
color
bottomGradientColor
:
Theme
.
backgroundColor
property
color
bottomGradientColor
:
Theme
.
backgroundColor
property
color
scrollerDecoratorColor
:
Theme
.
accentColor
section.criteria
:
ViewSection
.
FullString
section.criteria
:
ViewSection
.
FullString
section.delegate
:
Component
{
section.delegate
:
Component
{
...
@@ -67,20 +65,5 @@ ListView {
...
@@ -67,20 +65,5 @@ ListView {
}
}
}
}
Rectangle
{
id
:
scrollerDecorator
visible
:
(
listView
.
showDecorator
&&
listView
.
contentHeight
>
listView
.
height
)
color
:
scrollerDecoratorColor
width
:
Theme
.
itemSpacingExtraSmall
height
:
listView
.
height
*
listView
.
height
/
listView
.
contentHeight
y
:
(
listView
.
height
)
/
listView
.
contentHeight
*
listView
.
contentY
anchors
{
right
:
listView
.
right
rightMargin
:
Theme
.
itemSpacingExtraSmall
/
2
}
}
}
}
src/controls/qml/ScrollDecorator.qml
0 → 100644
View file @
664ca7fa
/****************************************************************************************
**
** Copyright (C) 2017 Chupligin Sergey <neochapay@gmail.com>
** All rights reserved.
**
** You may use this file under the terms of BSD license as follows:
**
** Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are met:
** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in the
** documentation and/or other materials provided with the distribution.
** * Neither the name of the author nor the
** names of its contributors may be used to endorse or promote products
** derived from this software without specific prior written permission.
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
** WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR
** ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
** (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
** LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
**
****************************************************************************************/
import
QtQuick
2.6
import
QtQuick
.
Controls
1.0
//needed for the Stack attached property
import
QtQuick
.
Controls
.
Nemo
1.0
Rectangle
{
id
:
scroolDecorator
property
var
flickable
visible
:
(
flickable
.
contentHeight
>
flickable
.
height
)
color
:
Theme
.
accentColor
width
:
Theme
.
itemSpacingExtraSmall
height
:
flickable
.
height
*
flickable
.
height
/
flickable
.
contentHeight
y
:
(
flickable
.
height
)
/
flickable
.
contentHeight
*
flickable
.
contentY
anchors
{
right
:
flickable
.
right
rightMargin
:
Theme
.
itemSpacingExtraSmall
/
2
}
}
src/controls/qml/qmldir
View file @
664ca7fa
...
@@ -26,6 +26,7 @@ GlacierRollerItem 1.0 GlacierRollerItem.qml
...
@@ -26,6 +26,7 @@ GlacierRollerItem 1.0 GlacierRollerItem.qml
InverseMouseArea 1.0 InverseMouseArea.qml
InverseMouseArea 1.0 InverseMouseArea.qml
IconButton 1.0 IconButton.qml
IconButton 1.0 IconButton.qml
DatePicker 1.0 DatePicker.qml
DatePicker 1.0 DatePicker.qml
ScrollDecorator 1.0 ScrollDecorator.qml
# MIRRORED CONTROLS:
# MIRRORED CONTROLS:
# These are the controls that we take directly from official QQC.
# These are the controls that we take directly from official QQC.
...
...
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