leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

shell: Fix missing titlebars

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-03-07 22:20:44 +01:00
parent 659933b039
commit 5d173a46a6
11 changed files with 208 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/backend/kms/mod.rs
View file

@ -1,7 +1,9 @@
// SPDX-License-Identifier: GPL-3.0-only
#[cfg(feature = "debug")]
use crate::backend::render::element::AsGlowRenderer;
use crate::{
backend::render::{element::CosmicElement, workspace_elements, CLEAR_COLOR},
backend::render::{workspace_elements, CLEAR_COLOR},
config::OutputConfig,
shell::Shell,
state::{BackendData, ClientState, Common, Data, Fps},
@ -944,15 +946,6 @@ impl Surface {
return Ok(());
}
self.fps.start();
#[cfg(feature = "debug")]
if let Some(rd) = self.fps.rd.as_mut() {
rd.start_frame_capture(
renderer.glow_renderer().egl_context().get_context_handle(),
std::ptr::null(),
);
}
let compositor = self.surface.as_mut().unwrap();
let (render_node, mut renderer) = match render_node {
Some((render_node, allocator)) => (
@ -963,8 +956,17 @@ impl Surface {
None => (target_node, api.single_renderer(&target_node).unwrap()),
};
self.fps.start();
#[cfg(feature = "debug")]
if let Some(rd) = self.fps.rd.as_mut() {
rd.start_frame_capture(
renderer.glow_renderer().egl_context().get_context_handle(),
std::ptr::null(),
);
}
let handle = state.shell.workspaces.active(&self.output).handle;
let elements: Vec<CosmicElement<GlMultiRenderer<'_, '_>>> = workspace_elements(
let elements = workspace_elements(
Some(&render_node),
&mut renderer,
state,
@ -973,7 +975,10 @@ impl Surface {
CursorMode::All,
&mut Some(&mut self.fps),
false,
)?;
)
.map_err(|err| {
anyhow::format_err!("Failed to accumulate elements for rendering: {:?}", err)
})?;
self.fps.elements();
let res = compositor.render_frame::<_, _, Gles2Renderbuffer>(