diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-04-15 13:34:48 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-15 14:40:38 +0200 |
| commit | f42ef1db6a111fd420776da2c620be9cefba7f14 (patch) | |
| tree | 62febf810aea2d6c93b8e5aa90ea8d071b061d4e | |
| parent | 4aad1242e142d4a1d92372a77f4a7855b2f23be8 (diff) | |
| download | qtquickcontrols-f42ef1db6a111fd420776da2c620be9cefba7f14.tar.gz | |
Fix tab visibility regression
Division by 0 caused strange behavior and made the tabs not
get a valid size even when the available size changed later.
Task-number: QTBUG-38294
Change-Id: I456e7a0cc244a76c81832fa580377674bcc5a828
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| -rw-r--r-- | src/controls/Styles/Base/TabViewStyle.qml | 2 | ||||
| -rw-r--r-- | src/controls/Styles/Desktop/TabViewStyle.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/Styles/Base/TabViewStyle.qml b/src/controls/Styles/Base/TabViewStyle.qml index dfb9b032..42fabfe4 100644 --- a/src/controls/Styles/Base/TabViewStyle.qml +++ b/src/controls/Styles/Base/TabViewStyle.qml @@ -139,7 +139,7 @@ Style { scale: control.tabPosition === Qt.TopEdge ? 1 : -1 property int totalOverlap: tabOverlap * (control.count - 1) - property real maxTabWidth: (styleData.availableWidth + totalOverlap) / control.count + property real maxTabWidth: control.count > 0 ? (styleData.availableWidth + totalOverlap) / control.count : 0 implicitWidth: Math.round(Math.min(maxTabWidth, textitem.implicitWidth + 20)) implicitHeight: Math.round(textitem.implicitHeight + 10) diff --git a/src/controls/Styles/Desktop/TabViewStyle.qml b/src/controls/Styles/Desktop/TabViewStyle.qml index 9244c7d8..f39046b2 100644 --- a/src/controls/Styles/Desktop/TabViewStyle.qml +++ b/src/controls/Styles/Desktop/TabViewStyle.qml @@ -85,7 +85,7 @@ Style { property int tabHSpace: __barstyle.pixelMetric("tabhspace"); property int tabVSpace: __barstyle.pixelMetric("tabvspace"); property int totalOverlap: tabOverlap * (control.count - 1) - property real maxTabWidth: (control.width + totalOverlap) / control.count + property real maxTabWidth: control.count > 0 ? (control.width + totalOverlap) / control.count : 0 implicitWidth: Math.min(maxTabWidth, Math.max(50, styleitem.textWidth(styleData.title)) + tabHSpace + 2) implicitHeight: Math.max(styleitem.font.pixelSize + tabVSpace + 6, 0) |