diff options
| author | Doris Verria <doris.verria@qt.io> | 2023-06-22 19:19:27 +0200 |
|---|---|---|
| committer | Doris Verria <doris.verria@qt.io> | 2023-06-27 14:38:39 +0200 |
| commit | 81e427894d73f4bb977681ee13e55e794f853c54 (patch) | |
| tree | 2ecc130831438b30338e31d83bb77c8c3f91b7d1 /src/quickcontrols/ios/impl/DialogButtonBoxDelegate.qml | |
| parent | 1d12a1e93add3a1ff303e6126fdaa8cf6f5e00af (diff) | |
iOS Style: Minor fixes to the control's palettes
- Use text role instead of windowText for the control text
- Don't set a different color for the disabled controls
in the QML templates. Instead, set the appropriate color
for the disabled group when initializing the palette
Task-number: QTBUG-114571
Pick-to: 6.5 6.6
Change-Id: Ifb6c5d06dbbc83fa47fd759c5c49a077a1b3a67a
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quickcontrols/ios/impl/DialogButtonBoxDelegate.qml')
| -rw-r--r-- | src/quickcontrols/ios/impl/DialogButtonBoxDelegate.qml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/quickcontrols/ios/impl/DialogButtonBoxDelegate.qml b/src/quickcontrols/ios/impl/DialogButtonBoxDelegate.qml index 5758218f88..ec506f6c06 100644 --- a/src/quickcontrols/ios/impl/DialogButtonBoxDelegate.qml +++ b/src/quickcontrols/ios/impl/DialogButtonBoxDelegate.qml @@ -26,8 +26,7 @@ Button { spacing: delegate.spacing color: delegate.DialogButtonBox.buttonRole === DialogButtonBox.DestructiveRole ? redColor - : delegate.enabled ? (delegate.down ? delegate.palette.highlight : delegate.palette.button) - : delegate.palette.mid + : (delegate.down ? delegate.palette.highlight : delegate.palette.button) } background: Item { |