Disable elide in TabButton

This messes up the fontmetrics needed to size the tab button. Before,
the labels would be elided no matter what.

This is more a band-aid than a real fix, we'll need to investigate how
we can make the sizing work correctly, but at least it "unscrews" the
layout of all of our tabbars.
This commit is contained in:
Sebastian Kügler 2014-03-26 00:13:54 +01:00
parent 0b4951c5b7
commit 84a212469f

View File

@ -141,7 +141,7 @@ Item {
visible: iconSource != null visible: iconSource != null
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
implicitWidth: 16//internal.portrait ? Math.max(units.iconSizes.small, root.height - (label.text ? label.height : 0)) : Math.max(units.iconSizes.small, root.height) implicitWidth: internal.portrait ? Math.max(units.iconSizes.small, root.height - (label.text ? label.height : 0)) : Math.max(units.iconSizes.small, root.height)
implicitHeight: implicitWidth implicitHeight: implicitWidth
} }
@ -155,7 +155,7 @@ Item {
Layout.preferredWidth: internal.portrait ? root.width : implicitWidth Layout.preferredWidth: internal.portrait ? root.width : implicitWidth
Layout.preferredHeight: internal.portrait ? implicitHeight : root.height Layout.preferredHeight: internal.portrait ? implicitHeight : root.height
elide: Text.ElideRight //elide: Text.ElideRight
horizontalAlignment: !internal.portrait && iconSource != null ? Text.AlignLeft : Text.AlignHCenter horizontalAlignment: !internal.portrait && iconSource != null ? Text.AlignLeft : Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter