git.iko.soy/unity8
on xenial help sign in
Remove UbuntuShapeForItem and replace its use with the more standard Ubuntu.Components.UbuntuShape.
13979a7Andrea Azzarone
qml/Components/UbuntuShapeForItem.qmldeleted−47
compare with xenial
unifiedsplit
@@ -1,47 +0,0 @@
1−/*
2− * Copyright (C) 2012 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−import QtQuick 2.4
18−import Ubuntu.Components 1.3
19−
20−/* FIXME: This component is duplicating the UbuntuShape from the SDK, but shapes more
21− * general (Item-based) components. This ability should be incorporated into the SDK's
22− * UbuntuShape so this file can be removed.
23− * Bug: https://bugs.launchpad.net/tavastia/+bug/1089595
24− */
25−
26−Item {
27− id: root
28−
29− property alias radius: shape.radius
30− property alias image: source.sourceItem
31− property alias aspect: shape.aspect
32−
33− ShaderEffectSource {
34− id: source
35− anchors.centerIn: parent // Placed under shape, so it's hidden
36− width: 1
37− height: 1
38− hideSource: true
39− }
40−
41− Shape {
42− id: shape
43− image: source
44−
45− anchors.fill: parent
46− }
47−}
qml/Launcher/LauncherPanel.qml+5−2
@@ -632,7 +632,7 @@ Rectangle {
632 }
632 }
633 }
633 }
634
634
635− UbuntuShapeForItem {
635+ UbuntuShape {
636 id: quickListShape
636 id: quickListShape
637 objectName: "quickListShape"
637 objectName: "quickListShape"
638 anchors.fill: quickList
638 anchors.fill: quickList
@@ -645,7 +645,10 @@ Rectangle {
645 UbuntuNumberAnimation {}
645 UbuntuNumberAnimation {}
646 }
646 }
647
647
648+ source: ShaderEffectSource {
648− image: quickList
649+ sourceItem: quickList
650+ hideSource: true
651+ }
649
652
650 Image {
653 Image {
651 anchors {
654 anchors {
qml/Stages/DesktopSpread.qml+2−2
@@ -311,10 +311,10 @@ FocusScope {
311 anchors { left: parent.left; top: parent.top; right: parent.right }
311 anchors { left: parent.left; top: parent.top; right: parent.right }
312 spacing: units.gu(1)
312 spacing: units.gu(1)
313
313
314− UbuntuShapeForItem {
314+ UbuntuShape {
315 Layout.preferredHeight: Math.min(units.gu(6), root.height * .05)
315 Layout.preferredHeight: Math.min(units.gu(6), root.height * .05)
316 Layout.preferredWidth: height * 8 / 7.6
316 Layout.preferredWidth: height * 8 / 7.6
317− image: Image {
317+ source: Image {
318 anchors.fill: parent
318 anchors.fill: parent
319 source: model.application.icon
319 source: model.application.icon
320 Rectangle {
320 Rectangle {