diff options
| author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2013-10-31 16:50:43 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-31 16:54:02 +0100 |
| commit | bd9ade606c1936ecb620dce857921920b828a234 (patch) | |
| tree | 871e7f59c133c6bc941bd991e8c91f85f5720dea /src | |
| parent | ecd02a21cda5d39f6715a8b737ddf2ec70c056c3 (diff) | |
Fix some issues with Base style
- Missing checkmark added
- Fixed TableView painting glitch on touch devices
Change-Id: Ifaad596061bc8d4432ad026efa74a13356b7a77e
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/controls/Styles/styles.pri | 4 | ||||
| -rw-r--r-- | src/controls/TableView.qml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/controls/Styles/styles.pri b/src/controls/Styles/styles.pri index 2079e79ea..ba0f8f448 100644 --- a/src/controls/Styles/styles.pri +++ b/src/controls/Styles/styles.pri @@ -70,7 +70,9 @@ STYLES_QML_FILES += \ $$PWD/Base/images/arrow-left.png \ $$PWD/Base/images/arrow-left@2x.png \ $$PWD/Base/images/arrow-right.png \ - $$PWD/Base/images/arrow-right@2x.png + $$PWD/Base/images/arrow-right@2x.png \ + $$PWD/Base/images/check.png \ + $$PWD/Base/images/check@2x.png STYLES_QML_FILES += $$PWD/qmldir diff --git a/src/controls/TableView.qml b/src/controls/TableView.qml index 9aa5cf2c5..586f1211d 100644 --- a/src/controls/TableView.qml +++ b/src/controls/TableView.qml @@ -476,7 +476,7 @@ ScrollView { implicitHeight: 150 frameVisible: true - __scrollBarTopMargin: Qt.platform.os === "osx" ? headerrow.height : 0 + __scrollBarTopMargin: (__style && __style.transientScrollBars || Qt.platform.os === "osx") ? headerrow.height : 0 __viewTopMargin: headerrow.height /*! \internal */ |