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

autocommit 2022-04-23 00:55:20 CEST

Browse source
This commit is contained in:
Julian Orth 2022-04-23 00:55:20 +02:00
parent 436f383cd6
commit e3b3d848c3
32 changed files with 1773 additions and 2451 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,7 @@ use {
sys::{eglInitialize, EGL_PLATFORM_GBM_KHR},
RenderError,
},
video::{dmabuf::DmaBuf, drm::Drm, gbm::GbmDevice, INVALID_MODIFIER, LINEAR_MODIFIER},
video::{dmabuf::DmaBuf, drm::Drm, gbm::GbmDevice, INVALID_MODIFIER},
},
ahash::AHashMap,
std::{ptr, rc::Rc},
@ -283,15 +283,6 @@ unsafe fn query_modifiers(
external_only: false,
},
);
if mods.is_empty() {
res.insert(
LINEAR_MODIFIER,
EglModifier {
modifier: LINEAR_MODIFIER,
external_only: false,
},
);
}
for (modifier, ext_only) in mods.iter().copied().zip(ext_only.iter().copied()) {
res.insert(
modifier as _,

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

@ -25,7 +25,10 @@ use {
},
state::State,
theme::Color,
tree::{ContainerNode, DisplayNode, FloatNode, OutputNode, PlaceholderNode, WorkspaceNode},
tree::{
ContainerNode, DisplayNode, FloatNode, OutputNode, PlaceholderNode, ToplevelNode,
WorkspaceNode,
},
utils::rc_eq::rc_eq,
},
std::{ops::Deref, rc::Rc, slice},
@ -51,7 +54,7 @@ impl Renderer<'_> {
pub fn render_output(&mut self, output: &OutputNode, x: i32, y: i32) {
if let Some(ws) = output.workspace.get() {
if let Some(fs) = ws.fullscreen.get() {
fs.as_node().node_render(self, x, y);
fs.tl_as_node().node_render(self, x, y);
return;
}
}
@ -169,7 +172,7 @@ impl Renderer<'_> {
}
pub fn render_placeholder(&mut self, placeholder: &PlaceholderNode, x: i32, y: i32) {
let pos = placeholder.position();
let pos = placeholder.tl_data().pos.get();
self.fill_boxes(
std::slice::from_ref(&pos.at_point(x, y)),
&Color::from_rgba(20, 20, 20, 255),