diff --git a/src/backend/kms/mod.rs b/src/backend/kms/mod.rs index aad54127..d0d17f86 100644 --- a/src/backend/kms/mod.rs +++ b/src/backend/kms/mod.rs @@ -3,7 +3,7 @@ #[cfg(feature = "debug")] use crate::backend::render::element::AsGlowRenderer; use crate::{ - backend::render::workspace_elements, + backend::render::{workspace_elements, CLEAR_COLOR}, config::OutputConfig, shell::Shell, state::{BackendData, ClientState, Common, Fps, SurfaceDmabufFeedback}, @@ -1241,11 +1241,10 @@ impl Surface { })?; self.fps.elements(); - let theme = state.theme.cosmic(); let res = compositor.render_frame::<_, _, GlesTexture>( &mut renderer, &elements, - crate::theme::clear_color(&theme), + CLEAR_COLOR, // TODO use a theme neutral color ); self.fps.render(); diff --git a/src/backend/render/mod.rs b/src/backend/render/mod.rs index 5e7796fa..76c4eb45 100644 --- a/src/backend/render/mod.rs +++ b/src/backend/render/mod.rs @@ -78,6 +78,7 @@ pub type GlMultiFrame<'a, 'b, 'frame> = MultiFrame<'a, 'a, 'b, 'frame, GbmGlesBackend, GbmGlesBackend>; pub type GlMultiError = MultiError, GbmGlesBackend>; +pub static CLEAR_COLOR: [f32; 4] = [0.153, 0.161, 0.165, 1.0]; pub static OUTLINE_SHADER: &str = include_str!("./shaders/rounded_outline.frag"); pub static RECTANGLE_SHADER: &str = include_str!("./shaders/rounded_rectangle.frag"); @@ -918,7 +919,7 @@ where renderer, age, &elements, - crate::theme::clear_color(state.theme.cosmic()), + CLEAR_COLOR, // TODO use a theme neutral color ); if let Some(fps) = fps.as_mut() { diff --git a/src/theme.rs b/src/theme.rs index e6837800..4336caa4 100644 --- a/src/theme.rs +++ b/src/theme.rs @@ -10,16 +10,6 @@ use cosmic::cosmic_theme::{ use crate::state::State; -pub(crate) fn clear_color(theme: &Theme) -> [f32; 4] { - let neutral_2 = theme.palette.neutral_2; - [ - neutral_2.red, - neutral_2.green, - neutral_2.blue, - neutral_2.alpha, - ] -} - pub(crate) fn group_color(theme: &Theme) -> [f32; 3] { let neutral_8 = theme.palette.neutral_8; [neutral_8.red, neutral_8.green, neutral_8.blue] diff --git a/src/wayland/handlers/screencopy.rs b/src/wayland/handlers/screencopy.rs index 11845d48..16a37b19 100644 --- a/src/wayland/handlers/screencopy.rs +++ b/src/wayland/handlers/screencopy.rs @@ -43,7 +43,7 @@ use crate::{ backend::render::{ cursor, element::{AsGlowRenderer, CosmicElement}, - render_output, render_workspace, CursorMode, + render_output, render_workspace, CursorMode, CLEAR_COLOR, }, shell::{CosmicMappedRenderElement, CosmicSurface, WorkspaceRenderElement}, state::{BackendData, ClientState, Common, State}, @@ -1019,7 +1019,7 @@ pub fn render_window_to_buffer( renderer, age, &elements, - crate::theme::clear_color(common.theme.cosmic()), + CLEAR_COLOR, // TODO use a theme neutral color ) }