Calculate implicitWith wide enough so that items don't have to ellide.
REVIEW: 105742
This commit is contained in:
parent
c71f8f509f
commit
f2eab7768b
@ -76,8 +76,8 @@ FocusScope {
|
|||||||
//Plasma extension
|
//Plasma extension
|
||||||
property Item currentTab
|
property Item currentTab
|
||||||
|
|
||||||
implicitWidth: tabBarLayout.implicitWidth + backgroundFrame.margins.left + backgroundFrame.margins.right + (buttonFrame.margins.left + buttonFrame.margins.right)*tabBarLayout.children.length
|
implicitWidth: layout.implicitWidth + backgroundFrame.margins.left + backgroundFrame.margins.right
|
||||||
implicitHeight: tabBarLayout.implicitHeight + backgroundFrame.margins.top + backgroundFrame.margins.bottom + buttonFrame.margins.top + buttonFrame.margins.bottom
|
implicitHeight: layout.implicitHeight + backgroundFrame.margins.top + backgroundFrame.margins.bottom
|
||||||
|
|
||||||
PlasmaCore.FrameSvgItem {
|
PlasmaCore.FrameSvgItem {
|
||||||
id: backgroundFrame
|
id: backgroundFrame
|
||||||
|
@ -112,6 +112,7 @@ Item {
|
|||||||
var visibleChildCount = childCount
|
var visibleChildCount = childCount
|
||||||
var contentWidth = 0
|
var contentWidth = 0
|
||||||
var contentHeight = 0
|
var contentHeight = 0
|
||||||
|
var maxChildWidth = 0
|
||||||
if (childCount != 0) {
|
if (childCount != 0) {
|
||||||
//not too much efficient but the loop over children needs to be done two times to get the proper child width
|
//not too much efficient but the loop over children needs to be done two times to get the proper child width
|
||||||
for (var i = 0; i < childCount; ++i) {
|
for (var i = 0; i < childCount; ++i) {
|
||||||
@ -137,7 +138,8 @@ Item {
|
|||||||
child.height = root.height
|
child.height = root.height
|
||||||
|
|
||||||
if (child.implicitWidth != undefined) {
|
if (child.implicitWidth != undefined) {
|
||||||
contentWidth = Math.max(contentWidth + i*10, (child.implicitWidth + buttonFrame.margins.left*2 + buttonFrame.margins.right*2) * childCount)
|
maxChildWidth = Math.max(maxChildWidth, child.implicitWidth)
|
||||||
|
contentWidth = Math.max(contentWidth + i*10, (maxChildWidth + buttonFrame.margins.left + buttonFrame.margins.right) * childCount)
|
||||||
contentHeight = Math.max(contentHeight, (child.implicitHeight + buttonFrame.margins.top + buttonFrame.margins.bottom))
|
contentHeight = Math.max(contentHeight, (child.implicitHeight + buttonFrame.margins.top + buttonFrame.margins.bottom))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user