andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-22 02:01:55 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Rename render_floating_for_output to render_interactive_move_for_output

Browse Source
This commit is contained in:
Ivan Molodetskikh
2025-04-12 08:53:13 +03:00
parent 37840a418a
commit 15ba2ab300
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/layout/mod.rs
+1 -1
View File
@@ -4476,7 +4476,7 @@ impl<W: LayoutElement> Layout<W> {
} }
} }
pub fn render_floating_for_output<'a, R: NiriRenderer + 'a>( pub fn render_interactive_move_for_output<'a, R: NiriRenderer + 'a>(
&'a self, &'a self,
renderer: &mut R, renderer: &mut R,
output: &Output, output: &Output,
src/niri.rs
+12 -4
View File
@@ -3774,9 +3774,9 @@ impl Niri {
// Get monitor elements. // Get monitor elements.
let mon = self.layout.monitor_for_output(output).unwrap(); let mon = self.layout.monitor_for_output(output).unwrap();
let monitor_elements: Vec<_> = mon.render_elements(renderer, target, focus_ring).collect(); let monitor_elements: Vec<_> = mon.render_elements(renderer, target, focus_ring).collect();
let float_elements: Vec<_> = self let int_move_elements: Vec<_> = self
.layout .layout
.render_floating_for_output(renderer, output, target) .render_interactive_move_for_output(renderer, output, target)
.collect(); .collect();
// Get layer-shell elements. // Get layer-shell elements.
@@ -3801,7 +3801,11 @@ impl Niri {
// When rendering above the top layer, we put the regular monitor elements first. // When rendering above the top layer, we put the regular monitor elements first.
// Otherwise, we will render all layer-shell pop-ups and the top layer on top. // Otherwise, we will render all layer-shell pop-ups and the top layer on top.
if mon.render_above_top_layer() { if mon.render_above_top_layer() {
elements.extend(float_elements.into_iter().map(OutputRenderElements::from)); elements.extend(
int_move_elements
.into_iter()
.map(OutputRenderElements::from),
);
elements.extend(monitor_elements.into_iter().map(OutputRenderElements::from)); elements.extend(monitor_elements.into_iter().map(OutputRenderElements::from));
elements.extend(layer_elems.popups.drain(..).map(OutputRenderElements::from)); elements.extend(layer_elems.popups.drain(..).map(OutputRenderElements::from));
@@ -3811,7 +3815,11 @@ impl Niri {
elements.extend(layer_elems.popups.drain(..).map(OutputRenderElements::from)); elements.extend(layer_elems.popups.drain(..).map(OutputRenderElements::from));
elements.extend(top_layer_normal.into_iter().map(OutputRenderElements::from)); elements.extend(top_layer_normal.into_iter().map(OutputRenderElements::from));
elements.extend(float_elements.into_iter().map(OutputRenderElements::from)); elements.extend(
int_move_elements
.into_iter()
.map(OutputRenderElements::from),
);
elements.extend(monitor_elements.into_iter().map(OutputRenderElements::from)); elements.extend(monitor_elements.into_iter().map(OutputRenderElements::from));
elements.extend(layer_elems.normal.drain(..).map(OutputRenderElements::from)); elements.extend(layer_elems.normal.drain(..).map(OutputRenderElements::from));