Commit 6580ec47 authored by Claudio Cambra's avatar Claudio Cambra
Browse files

Stop pushing day views as layer on desktop when clicking from other views

parent fcf878b0
Pipeline #129688 passed with stage
in 1 minute and 8 seconds
......@@ -216,6 +216,14 @@ Kirigami.OverlayDrawer {
if (sidebar.modal) sidebar.close()
}
},
KActionFromAction {
kalendarAction: "open_day_view"
checkable: false
onTriggered: {
dayViewAction.trigger()
if (sidebar.modal) sidebar.close()
}
},
KActionFromAction {
kalendarAction: "open_schedule_view"
checkable: false
......
......@@ -1002,22 +1002,7 @@ Kirigami.ApplicationWindow {
if(!isNaN(selectedDate.getTime())) {
root.selectedDate = selectedDate;
if(Kirigami.Settings.isMobile) {
dayViewAction.trigger();
} else {
const view = pageStack.layers.push(hourlyViewComponent);
view.daysToShow = 1;
if(filterHeader.active) {
// We need to remove the header from the view being covered and then reattach it, otherwise we get some
// nasty resizing issues when we remove the layer
pageStack.currentItem.header = null;
view.header = filterHeader.item;
view.QQC2.StackView.removed.connect(function () { pageStack.currentItem.header = filterHeader.item; });
}
view.setToDate(root.selectedDate, true);
}
dayViewAction.trigger();
}
}
......
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