Skip to content

G
glacier-home
Commit adbe1224 authored by m2ko's avatar m2ko
Browse files
Options

Fix FeedsPage scaling and make NotificationItem better looking and scaled

parent 8b2c870f
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 20 deletions
src/qml/FeedsPage.qml
View file @ adbe1224
...@@ -49,6 +49,8 @@ Flickable { ...@@ -49,6 +49,8 @@ Flickable {
anchors{ anchors{
top: parent.top top: parent.top
horizontalCenter: parent.horizontalCenter horizontalCenter: parent.horizontalCenter
topMargin: Theme.itemSpacingLarge
bottomMargin: Theme.itemSpacingLarge
} }
color: "transparent" color: "transparent"
...@@ -56,13 +58,12 @@ Flickable { ...@@ -56,13 +58,12 @@ Flickable {
Label { Label {
id: displayDayOfWeek id: displayDayOfWeek
text: Qt.formatDateTime(wallClock.time, "dddd") + ", " text: Qt.formatDateTime(wallClock.time, "dddd") + ", "
color: "white" color: Theme.textColor
font.pointSize: 12 font.pixelSize: Theme.fontSizeExtraLarge
font.bold: true font.bold: true
anchors { anchors {
top: parent.top top: parent.top
left: parent.left left: parent.left
topMargin: 30
} }
} }
...@@ -70,12 +71,12 @@ Flickable { ...@@ -70,12 +71,12 @@ Flickable {
Label { Label {
id: displayCurrentDate id: displayCurrentDate
text: Qt.formatDate(wallClock.time, "d MMMM yyyy") text: Qt.formatDate(wallClock.time, "d MMMM yyyy")
font.pointSize: 12 font.pixelSize: Theme.fontSizeExtraLarge
color: Theme.textColor
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
anchors { anchors {
left: displayDayOfWeek.right left: displayDayOfWeek.right
top: parent.top top: parent.top
topMargin: 30
} }
} }
} }
...@@ -87,7 +88,7 @@ Flickable { ...@@ -87,7 +88,7 @@ Flickable {
top: daterow.bottom top: daterow.bottom
topMargin: 50 topMargin: 50
} }
spacing: 10 spacing: Theme.itemSpacingHuge
Repeater { Repeater {
model: NotificationListModel { model: NotificationListModel {
id: notifmodel id: notifmodel
......
src/qml/notifications/NotificationItem.qml
View file @ adbe1224
...@@ -16,12 +16,12 @@ MouseArea { ...@@ -16,12 +16,12 @@ MouseArea {
Image { Image {
id: appIcon id: appIcon
height: 100 height: Theme.itemHeightExtraLarge
width: height width: height
anchors{ anchors{
left: parent.left left: parent.left
leftMargin: 20 leftMargin: Theme.itemSpacingLarge
} }
source: { source: {
...@@ -31,32 +31,48 @@ MouseArea { ...@@ -31,32 +31,48 @@ MouseArea {
return "/usr/share/lipstick-glacier-home-qt5/qml/images/glacier.svg" return "/usr/share/lipstick-glacier-home-qt5/qml/images/glacier.svg"
} }
} }
Label {
id: appName
text: modelData.appName
width: (rootitem.width-appIcon.width)-Theme.itemSpacingHuge
color: Theme.textColor
font.pixelSize: Theme.fontSizeMedium
font.capitalization: Font.AllUppercase
font.bold: true
anchors {
left: appIcon.right
top: parent.top
leftMargin: Theme.itemSpacingLarge
}
}
Label { Label {
id: appSummary id: appSummary
text: modelData.summary text: modelData.summary
width: (rootitem.width-appIcon.width)-40 width: (rootitem.width-appIcon.width)-Theme.itemSpacingHuge
font.pointSize: 12 color: Theme.textColor
font.bold :true font.pixelSize: Theme.fontSizeLarge
font.capitalization: Font.AllUppercase //font.bold :true
//font.capitalization: Font.AllUppercase
anchors{ anchors{
left: appIcon.right left: appName.left
leftMargin: 20 top: appName.bottom
top: parent.top topMargin: Theme.itemSpacingSmall
} }
wrapMode: Text.Wrap elide: Text.ElideRight
} }
Label { Label {
id: appBody id: appBody
width: (rootitem.width-appIcon.width)-40 width: (rootitem.width-appIcon.width)-Theme.itemSpacingHuge
text: modelData.body text: modelData.body
font.pointSize: 14 color: Theme.textColor
font.pixelSize: Theme.fontSizeMedium
anchors{ anchors{
left: appSummary.left left: appName.left
top: appSummary.bottom top: appSummary.bottom
} }
wrapMode: Text.Wrap elide: Text.ElideRight
} }
} }
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