summaryrefslogtreecommitdiff
path: root/tests/auto/controls/data/tableview
diff options
context:
space:
mode:
authorCaroline Chao <caroline.chao@digia.com>2013-05-06 16:16:13 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-07 14:32:56 +0200
commit533b45357246725efacf90b330a718d34a0cf3eb (patch)
tree8513856c771e3236a2afffcc316e665b374a517a /tests/auto/controls/data/tableview
parenta6deb27ba0252bc06fd6f28fb76b552e6320853f (diff)
downloadqtquickcontrols-533b45357246725efacf90b330a718d34a0cf3eb.tar.gz
TableView: Fix activated() not emitted
The mousearea in TableView has to accept mouse event in onPressed to receive upcoming double click event. Regression introduced by Iff3e5c1. Instead of not accepting the event in onPressed, set the MouseArea property propagateComposedEvents to true and does not accept the onClicked event. Also uses QStyle::SH_ItemView_ActivateItemOnSingleClick to check if the table is activated on single or double-clicking. By default, it is activated on double-clicking. Change-Id: I744174d7b31efebfae5e8db4db7b99a544ecf50f Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'tests/auto/controls/data/tableview')
-rw-r--r--tests/auto/controls/data/tableview/table_activated.qml54
-rw-r--r--tests/auto/controls/data/tableview/table_delegate.qml3
2 files changed, 57 insertions, 0 deletions
diff --git a/tests/auto/controls/data/tableview/table_activated.qml b/tests/auto/controls/data/tableview/table_activated.qml
new file mode 100644
index 00000000..52d420c4
--- /dev/null
+++ b/tests/auto/controls/data/tableview/table_activated.qml
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Tasuku Suzuki <stasuku@gmail.com>
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Quick Controls module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the 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 Digia Plc and its Subsidiary(-ies) 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
+** OWNER 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."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.1
+import QtQuick.Controls 1.0
+
+TableView {
+ height: 70
+ model: 10
+
+ property bool test: false
+ onActivated: test = true
+
+ TableViewColumn {
+ width: 100
+ }
+}
diff --git a/tests/auto/controls/data/tableview/table_delegate.qml b/tests/auto/controls/data/tableview/table_delegate.qml
index 38f4c1ce..a3ab621d 100644
--- a/tests/auto/controls/data/tableview/table_delegate.qml
+++ b/tests/auto/controls/data/tableview/table_delegate.qml
@@ -46,6 +46,9 @@ TableView {
model: [{"text": "text1"}, {"text": "text2"}, {"text": "text3"}]
property var test: 0
+ property bool activatedTest: false
+ onActivated: activatedTest = true
+
TableViewColumn {
title: "Text"
role: "text"