@@ -14,9 +14,9 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17−import QtQuick 2.0
17+import QtQuick 2.3
18−import Ubuntu.Components 0.1
18+import Ubuntu.Components 1.1
19−import Ubuntu.Components.ListItems 0.1 as ListItems
19+import Ubuntu.Components.ListItems 1.0 as ListItems
20import Unity.Launcher 0.1
20import Unity.Launcher 0.1
21import Ubuntu.Components.Popups 0.1
21import Ubuntu.Components.Popups 0.1
22import "../Components/ListItems"
22import "../Components/ListItems"
@@ -483,7 +483,7 @@ Rectangle {
483 id: quickListShape
483 id: quickListShape
484 objectName: "quickListShape"
484 objectName: "quickListShape"
485 anchors.fill: quickList
485 anchors.fill: quickList
486− opacity: quickList.state === "open" ? 0.8 : 0
486+ opacity: quickList.state === "open" ? 0.95 : 0
487 visible: opacity > 0
487 visible: opacity > 0
488 rotation: root.rotation
488 rotation: root.rotation
@@ -495,15 +495,15 @@ Rectangle {
497 anchors {
497 anchors {
498− right: parent.left
498+ left: parent.left
499− rightMargin: -units.dp(4)
499+ leftMargin: (quickList.item.width - units.gu(1)) / 2 - width / 2
500 verticalCenter: parent.verticalCenter
500 verticalCenter: parent.verticalCenter
501− verticalCenterOffset: -quickList.offset
501+ verticalCenterOffset: (parent.height / 2 + units.dp(3)) * (quickList.offset > 0 ? 1 : -1)
503 height: units.gu(1)
503 height: units.gu(1)
504 width: units.gu(2)
504 width: units.gu(2)
505 source: "graphics/quicklist_tooltip.png"
505 source: "graphics/quicklist_tooltip.png"
506− rotation: 90
506+ rotation: quickList.offset > 0 ? 0 : 180
509 InverseMouseArea {
509 InverseMouseArea {
@@ -519,16 +519,16 @@ Rectangle {
519 Rectangle {
519 Rectangle {
520 id: quickList
520 id: quickList
521 objectName: "quickList"
521 objectName: "quickList"
522− color: "#221e1c"
522+ color: "#f5f5f5"
523 width: units.gu(30)
523 width: units.gu(30)
524 height: quickListColumn.height
524 height: quickListColumn.height
525 visible: quickListShape.visible
525 visible: quickListShape.visible
526 anchors {
526 anchors {
527− left: root.inverted ? undefined : parent.right
527+ left: root.inverted ? undefined : parent.left
528− right: root.inverted ? parent.left : undefined
528+ right: root.inverted ? parent.right : undefined
529 margins: units.gu(1)
529 margins: units.gu(1)
531− y: itemCenter - (height / 2) + offset
531+ y: itemCenter + offset
532 rotation: root.rotation
532 rotation: root.rotation
534 property var model
534 property var model
@@ -537,8 +537,9 @@ Rectangle {
538 // internal
538 // internal
539 property int itemCenter: item ? root.mapFromItem(quickList.item).y + (item.height / 2) : units.gu(1)
539 property int itemCenter: item ? root.mapFromItem(quickList.item).y + (item.height / 2) : units.gu(1)
540− property int offset: itemCenter + (height/2) + units.gu(1) > parent.height ? -itemCenter - (height/2) - units.gu(1) + parent.height :
540+ property int offset: itemCenter + (item.height/2) + height + units.gu(1) > parent.height ?
541+ -(item.height/2) - height - units.gu(.5) :
541− itemCenter - (height/2) < units.gu(1) ? (height/2) - itemCenter + units.gu(1) : 0
542+ (item.height/2) + units.gu(.5)
544 id: quickListColumn
545 id: quickListColumn
@@ -554,11 +555,6 @@ Rectangle {
554 text: (model.clickable ? "" : "<b>") + model.label + (model.clickable ? "" : "</b>")
555 text: (model.clickable ? "" : "<b>") + model.label + (model.clickable ? "" : "</b>")
555 highlightWhenPressed: model.clickable
556 highlightWhenPressed: model.clickable
557− // FIXME: This is a workaround for the theme not being context sensitive. I.e. the
558− // ListItems don't know that they are sitting in a themed Popover where the color
559− // needs to be inverted.
560− __foregroundColor: Theme.palette.selected.backgroundText
562 onClicked: {
558 onClicked: {
563 if (!model.clickable) {
559 if (!model.clickable) {