Commit a0714a66 authored by Gabriel de Dietrich's avatar Gabriel de Dietrich Committed by The Qt Project
Browse files

Remove ButtonBehavior


It's private, and only used in BasicButton. Also, it brings in scope
the 'exclusiveGroup' property, meaning it would have probably broken
if used outside BasicButton.

Change-Id: I56ab9aef7fa675d8b6b571011cc4dc3a22bc718c
Reviewed-by: default avatarGabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: default avatarJ-P Nurmi <jpnurmi@digia.com>
parent f862a9dc
Branches
Tags
No related merge requests found
Showing with 21 additions and 73 deletions
......@@ -21,7 +21,6 @@ sourcedirs += ../
sources += ../../private/qstyleitem.cpp \
../../private/BasicButton.qml \
../../private/ButtonBehavior.qml \
../../private/FocusFrame.qml \
../../private/ModalPopupBehavior.qml \
../../private/PageSlideTransition.qml \
......
......@@ -92,9 +92,28 @@ Control {
}
}
ButtonBehavior {
MouseArea {
id: behavior
property bool checkable: false
property bool checked: false
property bool keyPressed: false
property bool effectivePressed: pressed && containsMouse || keyPressed
anchors.fill: parent
hoverEnabled: true
enabled: !keyPressed
onCheckableChanged: {
if (!checkable)
checked = false;
}
onReleased: {
if (checkable && containsMouse
&& (!exclusiveGroup || !checked))
checked = !checked;
}
onClicked: button.clicked()
onExited: PrivateHelper.hideToolTip()
onCanceled: PrivateHelper.hideToolTip()
......
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** 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.0
/*!
\qmltype ButtonBehavior
\internal
\inqmlmodule QtQuick.Controls.Private 1.0
*/
MouseArea {
id: behavior
property bool checkable: false
property bool checked: false
property bool keyPressed: false
property bool effectivePressed: pressed && containsMouse || keyPressed
hoverEnabled: true
enabled: !keyPressed
onCheckableChanged: {
if (!checkable)
checked = false;
}
onReleased: {
if (checkable && containsMouse
&& (!exclusiveGroup || !checked))
checked = !checked;
}
}
......@@ -26,7 +26,6 @@ OTHER_FILES += \
QML_FILES += \
TabBar.qml \
BasicButton.qml \
ButtonBehavior.qml \
Control.qml \
ModalPopupBehavior.qml \
PageSlideTransition.qml \
......@@ -39,4 +38,4 @@ mac {
LIBS += -framework Carbon
}
load(qml_plugin)
\ No newline at end of file
load(qml_plugin)
module QtQuick.Controls.Private
plugin privateplugin
ButtonBehavior 1.0 ButtonBehavior.qml
Control 1.0 Control.qml
FocusFrame 1.0 FocusFrame.qml
BasicButton 1.0 BasicButton.qml
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment