kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

autocommit 2022-04-13 12:58:04 CEST

Browse source
This commit is contained in:
Julian Orth 2022-04-13 12:58:04 +02:00
parent 8924936079
commit 661a28e5b0
23 changed files with 165 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/render/egl/display.rs
View file

@ -26,7 +26,7 @@ use {
sys::{eglInitialize, EGL_PLATFORM_GBM_KHR},
RenderError,
},
video::{dma::DmaBuf, drm::Drm, gbm::GbmDevice, INVALID_MODIFIER},
video::{dmabuf::DmaBuf, drm::Drm, gbm::GbmDevice, INVALID_MODIFIER},
},
ahash::AHashMap,
std::{ptr, rc::Rc},

2
src/render/renderer/context.rs
View file

@ -10,7 +10,7 @@ use {
RenderError, Texture,
},
video::{
dma::DmaBuf,
dmabuf::DmaBuf,
drm::{Drm, NodeType},
},
},

16
src/render/renderer/renderer.rs
View file

@ -28,7 +28,7 @@ use {
tree::{ContainerNode, FloatNode, OutputNode, WorkspaceNode},
utils::rc_eq::rc_eq,
},
std::{ops::Deref, rc::Rc},
std::{ops::Deref, rc::Rc, slice},
};
pub struct Renderer<'a> {
@ -58,8 +58,12 @@ impl Renderer<'_> {
let th = theme.title_height.get();
{
let rd = output.render_data.borrow_mut();
let c = theme.active_title_color.get();
self.fill_boxes(std::slice::from_ref(&rd.active_workspace), &c);
if let Some(aw) = &rd.active_workspace {
let c = theme.active_title_color.get();
self.fill_boxes(slice::from_ref(aw), &c);
}
let c = theme.underline_color.get();
self.fill_boxes(slice::from_ref(&rd.underline), &c);
let c = theme.title_color.get();
self.fill_boxes(&rd.inactive_workspaces, &c);
for title in &rd.titles {
@ -70,7 +74,7 @@ impl Renderer<'_> {
}
}
if let Some(ws) = output.workspace.get() {
self.render_workspace(&ws, x, y + th);
self.render_workspace(&ws, x, y + th + 1);
}
for stacked in self.state.root.stacked.iter() {
if stacked.node_visible() {
@ -152,6 +156,10 @@ impl Renderer<'_> {
self.fill_boxes2(&rd.underline_rects, &c, x, y);
let c = self.state.theme.border_color.get();
self.fill_boxes2(&rd.border_rects, &c, x, y);
if let Some(lar) = &rd.last_active_rect {
let c = self.state.theme.last_active_color.get();
self.fill_boxes2(std::slice::from_ref(lar), &c, x, y);
}
for title in &rd.titles {
self.render_texture(&title.tex, x + title.x, y + title.y, ARGB8888);
}