Fixed a problem with incorrect size hint on tabs

Task-number: QTCOMPONENTS-1188

1 files changed, 4 insertions, 6 deletions

diff --git a/components/TabBar.qml b/components/TabBar.qml
index 60075202..28808cf6 100644
--- a/components/TabBar.qml
+++ b/components/TabBar.qml
@@ -69,10 +69,10 @@ Item {
                 property bool selected : tabFrame.current == index
                 z: selected ? 1 : -1
                 width: Math.min(implicitWidth, tabbar.width/tabs.length)
-                function updateRect() {
-                    implicitWidth = style.implicitWidth
-                    height = style.implicitHeight
-                }
+
+                implicitWidth: Math.max(textitem.paintedWidth, style.implicitWidth)
+                implicitHeight: Math.max(textitem.paintedHeight, style.implicitHeight)
+
                 StyleItem {
                     id: style
                     elementType: "tab"
@@ -93,8 +93,6 @@ Item {
                         id: textitem
                         // Used for size hint
                         visible: false
-                        onWidthChanged: updateRect()
-                        onHeightChanged: updateRect()
                         text:  tabFrame.tabs[index].title
                     }
                 }