refactor: use a static color for CLEAR_COLOR
This commit is contained in:
parent
4e160dc669
commit
d9e3d60a37
4 changed files with 6 additions and 16 deletions
|
|
@ -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();
|
||||
|
||||
|
|
|
|||
|
|
@ -78,6 +78,7 @@ pub type GlMultiFrame<'a, 'b, 'frame> =
|
|||
MultiFrame<'a, 'a, 'b, 'frame, GbmGlesBackend<GlowRenderer>, GbmGlesBackend<GlowRenderer>>;
|
||||
pub type GlMultiError = MultiError<GbmGlesBackend<GlowRenderer>, GbmGlesBackend<GlowRenderer>>;
|
||||
|
||||
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() {
|
||||
|
|
|
|||
10
src/theme.rs
10
src/theme.rs
|
|
@ -10,16 +10,6 @@ use cosmic::cosmic_theme::{
|
|||
|
||||
use crate::state::State;
|
||||
|
||||
pub(crate) fn clear_color(theme: &Theme<Srgba>) -> [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<Srgba>) -> [f32; 3] {
|
||||
let neutral_8 = theme.palette.neutral_8;
|
||||
[neutral_8.red, neutral_8.green, neutral_8.blue]
|
||||
|
|
|
|||
|
|
@ -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
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue