Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Kalendar
Commits
6580ec47
Commit
6580ec47
authored
Jan 28, 2022
by
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
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/contents/ui/Sidebar.qml
View file @
6580ec47
...
...
@@ -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
...
...
src/contents/ui/main.qml
View file @
6580ec47
...
...
@@ -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
();
}
}
...
...
Claudio Cambra
@clau-cambra
mentioned in issue
#129 (closed)
·
Jan 27, 2022
mentioned in issue
#129 (closed)
mentioned in issue #129
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment