Commit 66ebe6dc authored by Aleksi Suomalainen's avatar Aleksi Suomalainen

[home] Revert lipstick api changes and modify scaling

parent 599bc36e
......@@ -43,10 +43,10 @@ GridView {
// just for margin purposes
header: Item {
height: 100
height: Math.min(parent.width,parent.height)/10
}
footer: Item {
height: 100
height: Math.min(parent.width,parent.height)/10
}
Item {
......
......@@ -235,7 +235,13 @@ Item {
Spinner {
id: spinner
anchors.centerIn: parent
anchors {
horizontalCenter: parent.horizontalCenter
top: parent.top
topMargin: 8
}
width: gridview.cellWidth - gridview.cellWidth/10
height: width
enabled: (model.object.type === LauncherModel.Application) ? model.object.isLaunching : false
}
}
......@@ -259,7 +265,7 @@ Item {
width: parent.width
elide: Text.ElideRight
horizontalAlignment: Text.AlignHCenter
font.pixelSize: gridview.cellWidth/10
font.pixelSize: gridview.cellWidth/8
color: 'white'
anchors {
left: parent.left
......
......@@ -22,7 +22,7 @@ Rectangle {
Text {
id: timeDisplay
font.pixelSize: 80
font.pointSize: 16
font.weight: Font.Light
lineHeight: 0.85
color: "white"
......@@ -39,7 +39,7 @@ Rectangle {
Text {
id: dateDisplay
font.pixelSize: 20
font.pointSize: 14
color: "white"
opacity: 0.8
horizontalAlignment: Text.AlignHCenter
......
......@@ -58,6 +58,7 @@ Page {
id: desktop
property alias lockscreen: lockScreen
property alias switcher: switcher
property int statusBarHeight: statusbar.height
// Implements back key navigation
Keys.onReleased: {
......
......@@ -42,7 +42,7 @@ import "statusbar"
Item {
id: root
z: 201
height: Math.min(parent.width,parent.height)/12
height: Math.min(parent.width,parent.height)/10
width: parent.width
anchors.bottom: parent.bottom
......
......@@ -36,7 +36,7 @@ MouseArea {
id: appSummary
text: modelData.summary
width: (rootitem.width-appIcon.width)-40
font.pointSize: 10
font.pointSize: 12
font.bold :true
font.capitalization: Font.AllUppercase
......@@ -52,8 +52,7 @@ MouseArea {
id: appBody
width: (rootitem.width-appIcon.width)-40
text: modelData.body
font.pointSize: 8
font.pointSize: 14
anchors{
left: appSummary.left
top: appSummary.bottom
......
......@@ -24,6 +24,9 @@
import QtQuick 2.0
import org.nemomobile.lipstick 0.1
import QtQuick.Controls.Nemo 1.0
import QtQuick.Controls.Styles.Nemo 1.0
import "../scripts/desktop.js" as Desktop
Item {
......@@ -36,14 +39,28 @@ Item {
rotation: Desktop.instance.parent.rotation
x: Desktop.instance.parent.x
y: Desktop.instance.parent.y
Rectangle {
id: dimmer
height: Math.min(parent.width,parent.height)/14
anchors.top: parent.top
anchors.topMargin: notificationArea.notificationHeight
anchors.left: parent.left
anchors.right: parent.right
gradient: Gradient {
GradientStop { position: 1.0; color: "black" }
GradientStop { position: 0; color: "transparent" }
}
}
MouseArea {
id: notificationArea
property int notificationHeight: 102
property int notificationHeight: Math.min(parent.width,parent.height)/12
property int notificationMargin: 14
property int notificationIconSize: 60
anchors.bottom: parent.bottom
anchors.bottomMargin: 48
property int notificationIconSize: Math.min(parent.width,parent.height)/12
anchors.top: parent.top
anchors.left: parent.left
width: notificationWindow.width
height: notificationArea.notificationHeight
......@@ -56,7 +73,7 @@ Item {
fill: parent
}
color: "transparent"
radius: 5
radius: 10
opacity: 0
......@@ -89,20 +106,6 @@ Item {
}
}
]
Rectangle {
id: dimmer
height: 15
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
gradient: Gradient {
GradientStop { position: 0; color: "black" }
GradientStop { position: 1.0; color: "transparent" }
}
}
transitions: [
Transition {
to: "show"
......@@ -140,26 +143,24 @@ Item {
source: "/usr/share/lipstick-glacier-home-qt5/qml/images/notification-circle.png"
}
Text {
Label {
id: summary
anchors {
top: parent.top
left: icon.right
right: parent.right
topMargin: notificationArea.notificationMargin
leftMargin: notificationArea.notificationMargin + 26
rightMargin: notificationArea.notificationMargin
bottomMargin: notificationArea.notificationMargin
}
font {
pixelSize: 36
}
font.pointSize: 12
text: notificationPreviewPresenter.notification != null ? notificationPreviewPresenter.notification.previewSummary : ""
color: "white"
clip: true
elide: Text.ElideRight
}
Text {
Label {
id: body
anchors {
top: summary.bottom
......@@ -167,7 +168,7 @@ Item {
right: summary.right
}
font {
pixelSize: 18
pointSize: 10
bold: true
}
text: notificationPreviewPresenter.notification != null ? notificationPreviewPresenter.notification.previewBody : ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment