diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2018-03-01 17:43:45 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-04 15:07:12 +0000 |
commit | 449ebc4fbc26db7b8ef4091f780163e3045b97c7 (patch) | |
tree | acaf476ffff80dbca05aaeda418ba78307665933 /src/imports/controls/material/MenuItem.qml | |
parent | f249c3d30de43e6f0e4f8905f8a4090a912b0a08 (diff) |
QQuickControl: update baseline offset automatically
...unless explicitly defined. All buttons repeated the same binding.
[ChangeLog][Controls][Control] Unless explicitly specified, baselineOffset
is now automatically updated based on the top padding of the control and
the baselineOffset of the contentItem. Styles no longer need to specify
the baselineOffset in QML.
Change-Id: I9c6f61371fee05a06b5dd31b27d8baf9da0bdeeb
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/material/MenuItem.qml')
-rw-r--r-- | src/imports/controls/material/MenuItem.qml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/imports/controls/material/MenuItem.qml b/src/imports/controls/material/MenuItem.qml index 4a26fa47..cdf88a75 100644 --- a/src/imports/controls/material/MenuItem.qml +++ b/src/imports/controls/material/MenuItem.qml @@ -49,7 +49,6 @@ T.MenuItem { implicitHeight: Math.max(background ? background.implicitHeight : 0, Math.max(contentItem.implicitHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) - baselineOffset: contentItem.y + contentItem.baselineOffset padding: 16 verticalPadding: Material.menuItemVerticalPadding |