Skip to content

Instantly share code, notes, and snippets.

@Zren
Created October 7, 2019 21:20
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save Zren/ba0959401501bd714b58df2df402a2aa to your computer and use it in GitHub Desktop.
Save Zren/ba0959401501bd714b58df2df402a2aa to your computer and use it in GitHub Desktop.
diff --git a/package/contents/ui/AgendaListItem.qml b/package/contents/ui/AgendaListItem.qml
index e00e06f9..466815b1 100644
--- a/package/contents/ui/AgendaListItem.qml
+++ b/package/contents/ui/AgendaListItem.qml
@@ -49,7 +49,7 @@ GridLayout {
LinkRect {
visible: agendaModel.showDailyWeather
Layout.alignment: Qt.AlignTop
- Layout.column: weatherOnRight ? 2 : 0
+ Layout.row: weatherOnRight ? 2 : 0
Layout.minimumWidth: appletConfig.agendaDateColumnWidth
implicitWidth: itemWeatherColumn.implicitWidth
onWidthChanged: {
@@ -112,7 +112,7 @@ GridLayout {
LinkRect {
Layout.alignment: Qt.AlignTop
- Layout.column: weatherOnRight ? 0 : 1
+ Layout.row: weatherOnRight ? 0 : 1
implicitWidth: appletConfig.agendaDateColumnWidth
// readonly property int maxOffset: agendaListItem.height - height
@@ -136,7 +136,7 @@ GridLayout {
font.weight: agendaItemIsToday ? inProgressFontWeight : Font.Normal
height: paintedHeight
Layout.fillWidth: true
- horizontalAlignment: Text.AlignRight
+ horizontalAlignment: Text.AlignHCenter
// MouseArea {
// anchors.fill: itemDateColumn
@@ -156,7 +156,7 @@ GridLayout {
font.weight: agendaItemIsToday ? inProgressFontWeight : Font.Normal
height: paintedHeight
Layout.fillWidth: true
- horizontalAlignment: Text.AlignRight
+ horizontalAlignment: Text.AlignHCenter
}
}
@@ -174,7 +174,7 @@ GridLayout {
ColumnLayout {
Layout.alignment: Qt.AlignTop | Qt.AlignLeft
- Layout.column: weatherOnRight ? 1 : 2
+ Layout.row: weatherOnRight ? 1 : 2
spacing: 0
NewEventForm {
@@ -193,6 +193,7 @@ GridLayout {
delegate: AgendaEventItem {
id: agendaEventItem
+ implicitWidth: 120 * units.devicePixelRatio
}
}
}
diff --git a/package/contents/ui/AgendaView.qml b/package/contents/ui/AgendaView.qml
index 70c80bf2..15eb48f6 100644
--- a/package/contents/ui/AgendaView.qml
+++ b/package/contents/ui/AgendaView.qml
@@ -57,9 +57,10 @@ Item {
// onScrollYChanged: console.log('scrollY', scrollY)
- ColumnLayout {
+ RowLayout {
id: agendaColumn
- width: agendaScrollView.viewportWidth
+ // width: agendaScrollView.viewportWidth
+ height: agendaScrollView.viewportHeight
spacing: 10 * units.devicePixelRatio
Repeater {
@@ -70,7 +71,8 @@ Item {
model: root.agendaModel
delegate: AgendaListItem {
// visible: agendaRepeater.populated
- width: agendaRepeater.width
+ // width: agendaRepeater.width
+ Layout.alignment: Qt.AlignTop
// onHeightChanged: {
// if (scrollToIndexTimer.running) {
// scrollToIndexTimer.updatePosition()
diff --git a/package/contents/ui/EventModel.qml b/package/contents/ui/EventModel.qml
index 3b084801..250af89a 100644
--- a/package/contents/ui/EventModel.qml
+++ b/package/contents/ui/EventModel.qml
@@ -93,9 +93,9 @@ CalendarManager {
googleCalendarManager.fetchAll(dateMin, dateMax)
plasmaCalendarManager.fetchAll(dateMin, dateMax)
// icalManager.fetchAll(dateMin, dateMax)
- // debugCalendarManager.showDebugEvents = true
+ debugCalendarManager.showDebugEvents = true
// debugCalendarManager.importGoogleSession = true
- // debugCalendarManager.fetchAll(dateMin, dateMax)
+ debugCalendarManager.fetchAll(dateMin, dateMax)
}
onAllDataFetched: mergeEvents()
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment