diff options
| author | Olivier De Cannière <olivier.decanniere@qt.io> | 2024-03-28 11:09:40 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-04-18 12:42:46 +0000 |
| commit | 0fe4ab9db21b93c2cb398710dbd8166cfe23a1b8 (patch) | |
| tree | c7b1d4969e9daeb3a7606add822e4bda943b7320 | |
| parent | 6fd68ab3f4a629cc36be83e6378db85e797acd74 (diff) | |
Fusion: Revert work-around for TabButton's y property not updating
QTBUG-108807 described how the first button of a TabBar wouldn't update
its y property on the Fusion style. This is because the binding would
get removed. With the underlying issue (QTBUG-120033) now fixed by the
previous commit, 3f6111588e0ab549607ae2eddb9880a87f34f022 which worked
around the issue can be reverted.
Pick-to: 6.5
Change-Id: I95687c8718b08b69897f4671e100fa4b9e61624f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit 9f32ed3d56da64a596129771f9da131a4dd21260)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/quickcontrols/fusion/TabButton.qml | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/quickcontrols/fusion/TabButton.qml b/src/quickcontrols/fusion/TabButton.qml index 088a6e4529..48ee303f63 100644 --- a/src/quickcontrols/fusion/TabButton.qml +++ b/src/quickcontrols/fusion/TabButton.qml @@ -24,8 +24,6 @@ T.TabButton { z: checked - topInset: control.checked || control.TabBar.position !== T.TabBar.Header ? 0 : 2 - contentItem: IconLabel { spacing: control.spacing mirrored: control.mirrored @@ -39,13 +37,9 @@ T.TabButton { background: Rectangle { - implicitHeight: 19 - - // TODO: Find out why the following binding fails to update the first tab button - // See QTBUG-108807 - // y: control.checked || control.TabBar.position !== T.TabBar.Header ? 0 : 2 - // implicitHeight: 21 - // height: control.height - (control.checked ? 0 : 2) + y: control.checked || control.TabBar.position !== T.TabBar.Header ? 0 : 2 + implicitHeight: 21 + height: control.height - (control.checked ? 0 : 2) border.color: Qt.lighter(Fusion.outline(control.palette), 1.1) |