Merge upstream/master (COSMIC 1.6) into local/yoda-main
32 commits amont, aucun conflit de code : seul le lockfile divergeait, il est regenere. Les 9 commits yoda sont preserves, dont le patch des onglets de piles suivant WindowControlsPosition. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
commit
f60c573f4d
39 changed files with 1945 additions and 657 deletions
|
|
@ -838,10 +838,7 @@ impl CosmicSurface {
|
|||
self.0
|
||||
.send_dmabuf_feedback(output, primary_scan_out_output, |_, data| {
|
||||
if is_fullscreen {
|
||||
feedback
|
||||
.primary_scanout_feedback
|
||||
.as_ref()
|
||||
.unwrap_or(&feedback.render_feedback)
|
||||
&feedback.primary_scanout_feedback
|
||||
} else if frame_time_filter_fn(data) == Kind::ScanoutCandidate {
|
||||
feedback
|
||||
.overlay_scanout_feedback
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue