[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: =?utf-8?q?=5Bplasma-mobile=5D_research/applets/mobilemenu/conten?=
From: Marco Martin <notmart () gmail ! com>
Date: 2011-02-12 14:25:01
Message-ID: 20110212142501.32DD4A609B () git ! kde ! org
[Download RAW message or body]
Git commit 0a406abe69552eedbb79d39849adf19ea5013ab3 by Marco Martin.
Committed on 12/02/2011 at 14:24.
Pushed by mart into branch 'master'.
rounded junction
M +6 -2 research/applets/mobilemenu/contents/ui/Connector.qml
M +4 -4 research/applets/mobilemenu/contents/ui/mobilemenu.qml
http://commits.kde.org/scratch/mart/plasma-mobile/0a406abe69552eedbb79d39849adf19ea5013ab3
diff --git a/research/applets/mobilemenu/contents/ui/Connector.qml \
b/research/applets/mobilemenu/contents/ui/Connector.qml index ea8b552..46115b4 100644
--- a/research/applets/mobilemenu/contents/ui/Connector.qml
+++ b/research/applets/mobilemenu/contents/ui/Connector.qml
@@ -26,14 +26,18 @@ Rectangle {
property Item itemA
property Item itemB
+ property real connectorAngle: Math.atan((itemB.y+height/2-64)/(itemB.x-64))
+
width: (itemB.x-64)/Math.cos(connectorAngle) -30
height: 12
+ radius: 7
color: "white"
smooth:true
- x: -width
+ x: -width +6
y: parent.height/2
transform: Rotation {
- origin.x: connectorRectangle.width
+ origin.x: connectorRectangle.width-6
+ origin.y: 6
angle: (180/Math.PI)*connectorAngle
}
}
\ No newline at end of file
diff --git a/research/applets/mobilemenu/contents/ui/mobilemenu.qml \
b/research/applets/mobilemenu/contents/ui/mobilemenu.qml index 4ca2b85..09aab68 \
100644
--- a/research/applets/mobilemenu/contents/ui/mobilemenu.qml
+++ b/research/applets/mobilemenu/contents/ui/mobilemenu.qml
@@ -123,14 +123,12 @@ Rectangle {
width: itemsRow.childrenRect.width
height: itemsRow.childrenRect.height
- property real connectorAngle: Math.atan((y+height/2-64)/(x-64))
-
Rectangle {
color: "white"
width: itemsRow.width -64
height: 12
- x: -12 * Math.sin(connectorAngle)
- y: parent.height/2 + (12 * Math.cos(connectorAngle) -12)
+ x: 0//-12 * Math.sin(connectorAngle)
+ y: parent.height/2 // + (12 * Math.cos(connectorAngle) -12)
}
Row {
@@ -177,6 +175,7 @@ Rectangle {
}
Connector {
id: itemConnector
+ itemA: activityRootSvg
itemB: delegate
}
@@ -196,6 +195,7 @@ Rectangle {
}
}
PlasmaCore.SvgItem {
+ id: activityRootSvg
width: 128
height: 128
svg: iconsSvg
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic