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

Crop workspaces during transition tightly

Browse Source
This commit is contained in:
Ivan Molodetskikh
2023-10-21 19:47:49 +04:00
parent f3e04981d8
commit ccce8d3141
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/layout.rs
+6 -7
View File
@@ -1706,7 +1706,7 @@ impl Monitor<Window> {
let output_scale = Scale::from(self.output.current_scale().fractional_scale()); let output_scale = Scale::from(self.output.current_scale().fractional_scale());
let output_transform = self.output.current_transform(); let output_transform = self.output.current_transform();
let output_mode = self.output.current_mode().unwrap(); let output_mode = self.output.current_mode().unwrap();
let output_size = output_transform.transform_size(output_mode.size); let size = output_transform.transform_size(output_mode.size);
match &self.workspace_switch { match &self.workspace_switch {
Some(switch) => { Some(switch) => {
@@ -1714,8 +1714,7 @@ impl Monitor<Window> {
let below_idx = render_idx.floor() as usize; let below_idx = render_idx.floor() as usize;
let above_idx = render_idx.ceil() as usize; let above_idx = render_idx.ceil() as usize;
let offset = let offset = ((render_idx - below_idx as f64) * size.h as f64).round() as i32;
((render_idx - below_idx as f64) * output_size.h as f64).round() as i32;
let below = self.workspaces[below_idx].render_elements(renderer); let below = self.workspaces[below_idx].render_elements(renderer);
let above = self.workspaces[above_idx].render_elements(renderer); let above = self.workspaces[above_idx].render_elements(renderer);
@@ -1725,7 +1724,7 @@ impl Monitor<Window> {
CropRenderElement::from_element( CropRenderElement::from_element(
elem, elem,
output_scale, output_scale,
Rectangle::from_loc_and_size((0, 0), output_size), Rectangle::from_extemities((0, offset), (size.w, size.h)),
)?, )?,
(0, -offset), (0, -offset),
Relocate::Relative, Relocate::Relative,
@@ -1736,9 +1735,9 @@ impl Monitor<Window> {
CropRenderElement::from_element( CropRenderElement::from_element(
elem, elem,
output_scale, output_scale,
Rectangle::from_loc_and_size((0, 0), output_size), Rectangle::from_extemities((0, 0), (size.w, offset)),
)?, )?,
(0, -offset + output_size.h), (0, -offset + size.h),
Relocate::Relative, Relocate::Relative,
)) ))
}); });
@@ -1753,7 +1752,7 @@ impl Monitor<Window> {
CropRenderElement::from_element( CropRenderElement::from_element(
elem, elem,
output_scale, output_scale,
Rectangle::from_loc_and_size((0, 0), output_size), Rectangle::from_loc_and_size((0, 0), size),
)?, )?,
(0, 0), (0, 0),
Relocate::Relative, Relocate::Relative,