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