diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-10-31 14:55:34 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-11-02 09:12:18 +0000 |
| commit | 1350b91aaf9a343d721ea085fd924812e518ccbd (patch) | |
| tree | d2d5c0740001ae51b79469e23f2e0db2c8933765 /src/imports/controls/RadioDelegate.qml | |
| parent | 0504150e4a0a3874a8e431af351277f7342dac95 (diff) | |
Default: merge RadioIndicator back to RadioButton & RadioDelegate
See the previous commit (CheckIndicator) for more details.
Before:
running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_radiobutton.qml
[...]
Average: 91.6 frames; using samples; MedianAll=91; StdDev=1.51658, CoV=0.0165565
After:
running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_radiobutton.qml
[...]
Average: 95.8 frames; using samples; MedianAll=96; StdDev=2.04939, CoV=0.0213924
Change-Id: Ic185241767d0b9422e86919356e3155e00803e56
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/RadioDelegate.qml')
| -rw-r--r-- | src/imports/controls/RadioDelegate.qml | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/imports/controls/RadioDelegate.qml b/src/imports/controls/RadioDelegate.qml index bf14dbc1..8cfe6e5f 100644 --- a/src/imports/controls/RadioDelegate.qml +++ b/src/imports/controls/RadioDelegate.qml @@ -71,11 +71,28 @@ T.RadioDelegate { color: control.palette.text } - indicator: RadioIndicator { + // keep in sync with RadioButton.qml (shared RadioIndicator.qml was removed for performance reasons) + indicator: Rectangle { + implicitWidth: 28 + implicitHeight: 28 + x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding y: control.topPadding + (control.availableHeight - height) / 2 - control: control + radius: width / 2 + color: control.down ? control.palette.light : control.palette.base + border.width: control.visualFocus ? 2 : 1 + border.color: control.visualFocus ? control.palette.highlight : control.palette.mid + + Rectangle { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: 20 + height: 20 + radius: width / 2 + color: control.palette.text + visible: control.checked + } } background: Rectangle { |