diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-04 13:19:53 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-05 07:19:53 +0000 |
commit | 408eb756d0a429c7b9c8189b7475b0ddfaa7a21e (patch) | |
tree | cbc58e3e8e2786631d741b0d5a94f685b12b2fe3 | |
parent | 6e09119c3739d25edefb4d9b69f83cb55bd184c2 (diff) |
MenuItem: specify baseline offset
Change-Id: I55eaf9d49785377c50d6c5dff6923c90a304d6bc
Task-number: QTBUG-49468
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
-rw-r--r-- | src/imports/controls/MenuItem.qml | 1 | ||||
-rw-r--r-- | src/imports/controls/material/MenuItem.qml | 1 | ||||
-rw-r--r-- | src/imports/controls/universal/MenuItem.qml | 1 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_menuitem.qml | 64 |
4 files changed, 67 insertions, 0 deletions
diff --git a/src/imports/controls/MenuItem.qml b/src/imports/controls/MenuItem.qml index 4785f050..ae5a8e38 100644 --- a/src/imports/controls/MenuItem.qml +++ b/src/imports/controls/MenuItem.qml @@ -45,6 +45,7 @@ T.MenuItem { + (label && indicator ? spacing : 0) + leftPadding + rightPadding implicitHeight: background ? background.implicitHeight : (label ? label.implicitHeight : 0) + (indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding + baselineOffset: label ? label.y + label.baselineOffset : 0 padding: 6 diff --git a/src/imports/controls/material/MenuItem.qml b/src/imports/controls/material/MenuItem.qml index 6ec67cde..f9c69291 100644 --- a/src/imports/controls/material/MenuItem.qml +++ b/src/imports/controls/material/MenuItem.qml @@ -48,6 +48,7 @@ T.MenuItem { implicitHeight: Math.max(background ? background.implicitHeight : 0, Math.max(label ? label.implicitHeight : 0, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: label ? label.y + label.baselineOffset : 0 padding: 16 spacing: 16 diff --git a/src/imports/controls/universal/MenuItem.qml b/src/imports/controls/universal/MenuItem.qml index fa8b3529..fee5d886 100644 --- a/src/imports/controls/universal/MenuItem.qml +++ b/src/imports/controls/universal/MenuItem.qml @@ -46,6 +46,7 @@ T.MenuItem { + (label && indicator ? spacing : 0) + leftPadding + rightPadding implicitHeight: background ? background.implicitHeight : (label ? label.implicitHeight : 0) + (indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding + baselineOffset: label ? label.y + label.baselineOffset : 0 topPadding: 11 leftPadding: 12 diff --git a/tests/auto/controls/data/tst_menuitem.qml b/tests/auto/controls/data/tst_menuitem.qml new file mode 100644 index 00000000..8581a43f --- /dev/null +++ b/tests/auto/controls/data/tst_menuitem.qml @@ -0,0 +1,64 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the test suite 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 The Qt Company Ltd 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.2 +import QtTest 1.0 +import Qt.labs.controls 1.0 + +TestCase { + id: testCase + width: 200 + height: 200 + visible: true + when: windowShown + name: "MenuItem" + + Component { + id: menuItem + MenuItem { } + } + + function test_baseline() { + var control = menuItem.createObject(testCase) + verify(control) + compare(control.baselineOffset, control.label.y + control.label.baselineOffset) + control.destroy() + } +} |