diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-06-04 23:11:14 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-06-04 23:13:24 +0200 |
| commit | efacf765b008571d8feeb3423e5af5bcb8426219 (patch) | |
| tree | 1f44b47b0d9a9efd4a00e33943d9c3c0477ec7eb | |
| parent | 8e7e0c7db6edd43bf80fa954cd50015b90f07205 (diff) | |
| parent | ca06986af37dad834afe7f6c81eb20d0751c6d78 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ife57f59094cb9be9c5e8a187df8d1fd25110a53a
| -rw-r--r-- | src/controls/Styles/Base/SliderStyle.qml | 4 | ||||
| -rw-r--r-- | src/controls/TableViewColumn.qml | 2 | ||||
| -rw-r--r-- | src/controls/TextArea.qml | 7 | ||||
| -rw-r--r-- | src/controls/TextField.qml | 2 | ||||
| -rw-r--r-- | src/dialogs/DefaultFileDialog.qml | 12 | ||||
| -rw-r--r-- | src/dialogs/qml/DefaultWindowDecoration.qml | 5 |
6 files changed, 19 insertions, 13 deletions
diff --git a/src/controls/Styles/Base/SliderStyle.qml b/src/controls/Styles/Base/SliderStyle.qml index c03d96d58..d51090896 100644 --- a/src/controls/Styles/Base/SliderStyle.qml +++ b/src/controls/Styles/Base/SliderStyle.qml @@ -71,8 +71,8 @@ import QtQuick.Controls.Private 1.0 color: control.pressed ? "white" : "lightgray" border.color: "gray" border.width: 2 - width: 34 - height: 34 + implicitWidth: 34 + implicitHeight: 34 radius: 12 } } diff --git a/src/controls/TableViewColumn.qml b/src/controls/TableViewColumn.qml index 32068f226..931d32dac 100644 --- a/src/controls/TableViewColumn.qml +++ b/src/controls/TableViewColumn.qml @@ -132,7 +132,7 @@ QtObject { if (__view.__columns[i] === this) __index = i for (var row = 0 ; row < listdata.children.length ; ++row) { - var item = listdata.children[row+1] ? listdata.children[row+1].rowItem : undefined + var item = listdata.children[row] ? listdata.children[row].rowItem : undefined if (item && item.children[1] && item.children[1].children[__index] && item.children[1].children[__index].children[0] && item.children[1].children[__index].children[0].hasOwnProperty("implicitWidth")) minWidth = Math.max(minWidth, item.children[1].children[__index].children[0].implicitWidth) diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml index 4974d1860..1ea265d69 100644 --- a/src/controls/TextArea.qml +++ b/src/controls/TextArea.qml @@ -732,12 +732,7 @@ ScrollView { onWrapModeChanged: edit.doLayout() renderType: __style ? __style.renderType : Text.NativeRendering - Binding { - target: edit - property: 'font' - value: __style.font - when: __style - } + font: __style ? __style.font : TextSingleton.font color: __style ? __style.textColor : "darkgray" selectionColor: __style ? __style.selectionColor : "darkred" selectedTextColor: __style ? __style.selectedTextColor : "white" diff --git a/src/controls/TextField.qml b/src/controls/TextField.qml index a248618a3..a20a5c40c 100644 --- a/src/controls/TextField.qml +++ b/src/controls/TextField.qml @@ -601,7 +601,7 @@ Control { selectionColor: __panel ? __panel.selectionColor : "darkred" selectedTextColor: __panel ? __panel.selectedTextColor : "white" - font: __panel ? __panel.font : undefined + font: __panel ? __panel.font : TextSingleton.font anchors.leftMargin: __panel ? __panel.leftMargin : 0 anchors.topMargin: __panel ? __panel.topMargin : 0 anchors.rightMargin: __panel ? __panel.rightMargin : 0 diff --git a/src/dialogs/DefaultFileDialog.qml b/src/dialogs/DefaultFileDialog.qml index 7ebd443ae..3423dfd26 100644 --- a/src/dialogs/DefaultFileDialog.qml +++ b/src/dialogs/DefaultFileDialog.qml @@ -139,6 +139,18 @@ AbstractFileDialog { property: "text" value: root.urlToPath(root.folder) } + Keys.onPressed: { + event.accepted = true + switch (event.key) { + case Qt.Key_Back: + case Qt.Key_Escape: + reject() + break + default: + event.accepted = false + break + } + } SplitView { id: splitter diff --git a/src/dialogs/qml/DefaultWindowDecoration.qml b/src/dialogs/qml/DefaultWindowDecoration.qml index 64eb4387e..9b0066980 100644 --- a/src/dialogs/qml/DefaultWindowDecoration.qml +++ b/src/dialogs/qml/DefaultWindowDecoration.qml @@ -1,6 +1,6 @@ /***************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQuick.Dialogs module of the Qt Toolkit. @@ -49,8 +49,7 @@ Rectangle { signal dismissed MouseArea { anchors.fill: parent - enabled: dismissOnOuterClick - onClicked: dismissed() + onClicked: if (dismissOnOuterClick) dismissed() BorderImage { id: borderImage property Item content |