diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-10-30 12:38:36 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-11-02 08:33:17 +0000 |
| commit | e02ebcdb0b10b1c9f077d813c08d83e0d17ca6b5 (patch) | |
| tree | eacf840bdf6b65f7bed272a86c6684c3503c1550 /src/imports/controls | |
| parent | 61cb7ca7e8d8ebc5103870ae2795dbc65eb2c89f (diff) | |
Optimize CheckBox, Switch, and RadioButton
Add an internal CheckLabel helper that simply initializes a few
QQuickText properties with defaults that are suitable for CheckBox,
Switch, and RadioButton. This gives a 10% boost on desktop in debug
mode, and a 5% boost on a TX1 in release mode.
Change-Id: I82fead9ca22b6aa74f24924d240c924b2a42a912
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls')
| -rw-r--r-- | src/imports/controls/CheckBox.qml | 6 | ||||
| -rw-r--r-- | src/imports/controls/RadioButton.qml | 6 | ||||
| -rw-r--r-- | src/imports/controls/Switch.qml | 6 | ||||
| -rw-r--r-- | src/imports/controls/qtquickcontrols2plugin.cpp | 3 |
4 files changed, 6 insertions, 15 deletions
diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml index 9ae4f8f6..4348781d 100644 --- a/src/imports/controls/CheckBox.qml +++ b/src/imports/controls/CheckBox.qml @@ -58,16 +58,12 @@ T.CheckBox { control: control } - contentItem: Text { + contentItem: CheckLabel { leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 text: control.text font: control.font color: control.palette.windowText - elide: Text.ElideRight - visible: control.text - horizontalAlignment: Text.AlignLeft - verticalAlignment: Text.AlignVCenter } } diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml index c00360cf..2ea9dbfa 100644 --- a/src/imports/controls/RadioButton.qml +++ b/src/imports/controls/RadioButton.qml @@ -58,16 +58,12 @@ T.RadioButton { control: control } - contentItem: Text { + contentItem: CheckLabel { leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 text: control.text font: control.font color: control.palette.windowText - elide: Text.ElideRight - visible: control.text - horizontalAlignment: Text.AlignLeft - verticalAlignment: Text.AlignVCenter } } diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml index 2ff9c553..66f624d9 100644 --- a/src/imports/controls/Switch.qml +++ b/src/imports/controls/Switch.qml @@ -58,16 +58,12 @@ T.Switch { control: control } - contentItem: Text { + contentItem: CheckLabel { leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 text: control.text font: control.font color: control.palette.windowText - elide: Text.ElideRight - visible: control.text - horizontalAlignment: Text.AlignLeft - verticalAlignment: Text.AlignVCenter } } diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index dbb1e106..768f4ab8 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -36,6 +36,7 @@ #include <QtCore/private/qfileselector_p.h> #include <QtQuickControls2/qquickstyle.h> +#include <QtQuickControls2/private/qquickchecklabel_p.h> #include <QtQuickControls2/private/qquickcolor_p.h> #include <QtQuickControls2/private/qquickcolorimage_p.h> #include <QtQuickControls2/private/qquickiconimage_p.h> @@ -201,6 +202,8 @@ void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char *ur qmlRegisterType<QQuickIconImage>(import, 2, 3, "IconImage"); qmlRegisterSingletonType<QQuickColor>(import, 2, 3, "Color", colorSingleton); qmlRegisterType<QQuickIconLabel>(import, 2, 3, "IconLabel"); + qmlRegisterType<QQuickCheckLabel>(import, 2, 3, "CheckLabel"); + qmlRegisterRevision<QQuickText, 6>(import, 2, 3); } QString QtQuickControls2Plugin::name() const |