alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

correct cuttong of the button in case of scrolling

Browse Source
This commit is contained in:
Marco Martin 2012-10-11 11:40:42 +02:00
parent c56534ba47
commit e7a5a5fbcf
1 changed files with 56 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
declarativeimports/plasmacomponents/qml/TabBar.qml
View File

@ -76,8 +76,6 @@ FocusScope {
//Plasma extension //Plasma extension
property Item currentTab property Item currentTab
clip: true
implicitWidth: layout.implicitWidth + backgroundFrame.margins.left + backgroundFrame.margins.right implicitWidth: layout.implicitWidth + backgroundFrame.margins.left + backgroundFrame.margins.right
implicitHeight: layout.implicitHeight + backgroundFrame.margins.top + backgroundFrame.margins.bottom implicitHeight: layout.implicitHeight + backgroundFrame.margins.top + backgroundFrame.margins.bottom
@ -89,13 +87,21 @@ FocusScope {
prefix: "sunken" prefix: "sunken"
} }
Item {
id: buttonCutter
anchors {
fill: parent
leftMargin: 1
rightMargin: (buttonsLayout.visible ? buttonsLayout.width : 0) + 1
}
clip: true
PlasmaCore.FrameSvgItem { PlasmaCore.FrameSvgItem {
id: buttonFrame id: buttonFrame
visible: currentTab !== null visible: currentTab !== null
x: tabBarLayout.x + currentTab.x + backgroundFrame.margins.left x: tabBarLayout.x + currentTab.x + backgroundFrame.margins.left -1
y: backgroundFrame.margins.top y: backgroundFrame.margins.top
width: currentTab.width + margins.left + margins.right width: currentTab.width + margins.left + margins.right -1
height: currentTab.height + margins.top + margins.bottom height: currentTab.height + margins.top + margins.bottom
imagePath: "widgets/button" imagePath: "widgets/button"
prefix: "normal" prefix: "normal"
@ -106,6 +112,40 @@ FocusScope {
} }
} }
} }
}
PlasmaCore.Svg {
id: scrollWidgetSvg
imagePath: "widgets/scrollwidget"
}
PlasmaCore.SvgItem {
svg: scrollWidgetSvg
elementId: "border-left"
width: naturalSize.width
visible: buttonsLayout.visible
anchors {
left: buttonCutter.left
leftMargin: -1
top: buttonCutter.top
bottom: buttonCutter.bottom
topMargin: backgroundFrame.margins.top
bottomMargin: backgroundFrame.margins.bottom
}
}
PlasmaCore.SvgItem {
svg: scrollWidgetSvg
elementId: "border-right"
width: naturalSize.width
visible: buttonsLayout.visible
anchors {
right: buttonCutter.right
rightMargin: -1
top: buttonCutter.top
bottom: buttonCutter.bottom
topMargin: backgroundFrame.margins.top
bottomMargin: backgroundFrame.margins.bottom
}
}
onCurrentTabChanged: tabBarLayout.x = Math.max(Math.min(0, -(currentTab.x + currentTab.width/2) + tabbarScroller.width/2), -tabBarLayout.width + tabbarScroller.width) onCurrentTabChanged: tabBarLayout.x = Math.max(Math.min(0, -(currentTab.x + currentTab.width/2) + tabbarScroller.width/2), -tabBarLayout.width + tabbarScroller.width)
@ -118,7 +158,7 @@ FocusScope {
fill: parent fill: parent
leftMargin: backgroundFrame.margins.left + buttonFrame.margins.left leftMargin: backgroundFrame.margins.left + buttonFrame.margins.left
topMargin: backgroundFrame.margins.top + buttonFrame.margins.top topMargin: backgroundFrame.margins.top + buttonFrame.margins.top
rightMargin: backgroundFrame.margins.right + buttonFrame.margins.right + (buttonsLayout.visible ? buttonsLayout.width : 0) rightMargin: backgroundFrame.margins.right + (buttonsLayout.visible ? buttonsLayout.width : buttonFrame.margins.right)
bottomMargin: backgroundFrame.margins.bottom + buttonFrame.margins.bottom bottomMargin: backgroundFrame.margins.bottom + buttonFrame.margins.bottom
} }