diff options
| author | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-06-03 10:29:35 +0200 |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-06-03 09:39:59 +0000 |
| commit | 6dd92ec5d3d91c0d946453c2c420817a23300c4c (patch) | |
| tree | 819530508146d35fe0dc3b843cd87f8857ab3d9c /src/imports/nativestyle/controls/DefaultTextArea.qml | |
| parent | 09d35ba20553f27ba4183781ca9dc8dfa2e16f3f (diff) | |
Native style: remove insets, and use layoutRect
We have so far used insets to ensure that the controls
end up aligned inside a layout. But this is most likely wrong, since
insets in QtQuickControls2 is supposed to only move the
background, and not the whole control (including contents,
which we used to move as well in Button.qml). So after looking at
this one more time, I think the right solution is to leave
insets alone, and instead provide a layoutRect from
QQuickStyleItem. This rect can later be used by layouts to
align the controls correctly.
Change-Id: I3cd97d34ca6f629dedef3e2afd2ae9e257f9df22
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/nativestyle/controls/DefaultTextArea.qml')
| -rw-r--r-- | src/imports/nativestyle/controls/DefaultTextArea.qml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/imports/nativestyle/controls/DefaultTextArea.qml b/src/imports/nativestyle/controls/DefaultTextArea.qml index 882ec43e..bb948e58 100644 --- a/src/imports/nativestyle/controls/DefaultTextArea.qml +++ b/src/imports/nativestyle/controls/DefaultTextArea.qml @@ -55,11 +55,6 @@ T.TextArea { topPadding: nativeBackground ? background.contentPadding.top : 3 bottomPadding: nativeBackground ? background.contentPadding.bottom + 5: 3 - topInset: nativeBackground ? background.insets.top : 0 - bottomInset: nativeBackground ? background.insets.bottom: 0 - leftInset: nativeBackground ? background.insets.left : 0 - rightInset: nativeBackground ? background.insets.right : 0 - color: control.palette.text selectionColor: control.palette.highlight selectedTextColor: control.palette.highlightedText |