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

Extract rules out

Browse Source
This commit is contained in:
Ivan Molodetskikh
2024-05-04 11:43:56 +04:00
parent 7093385b4d
commit 79093baeee
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/layout/tile.rs
+6 -13
View File
@@ -594,6 +594,10 @@ impl<W: LayoutElement> Tile<W> {
let window_render_loc = location + window_loc; let window_render_loc = location + window_loc;
let area = Rectangle::from_loc_and_size(window_render_loc, animated_window_size); let area = Rectangle::from_loc_and_size(window_render_loc, animated_window_size);
let rules = self.window.rules();
let clip_to_geometry = !self.is_fullscreen && rules.clip_to_geometry == Some(true);
let radius = rules.geometry_corner_radius.unwrap_or_default();
// If we're resizing, try to render a shader, or a fallback. // If we're resizing, try to render a shader, or a fallback.
let mut resize_shader = None; let mut resize_shader = None;
let mut resize_popups = None; let mut resize_popups = None;
@@ -629,11 +633,6 @@ impl<W: LayoutElement> Tile<W> {
.map_err(|err| warn!("error rendering window to texture: {err:?}")) .map_err(|err| warn!("error rendering window to texture: {err:?}"))
.ok(); .ok();
let rules = self.window.rules();
let clip_to_geometry =
!self.is_fullscreen && rules.clip_to_geometry == Some(true);
let corner_radius = rules.geometry_corner_radius.unwrap_or_default();
if let Some((texture_current, _sync_point, texture_current_geo)) = current { if let Some((texture_current, _sync_point, texture_current_geo)) = current {
let elem = ResizeRenderElement::new( let elem = ResizeRenderElement::new(
area, area,
@@ -644,7 +643,7 @@ impl<W: LayoutElement> Tile<W> {
window_size, window_size,
resize.anim.value() as f32, resize.anim.value() as f32,
resize.anim.clamped_value().clamp(0., 1.) as f32, resize.anim.clamped_value().clamp(0., 1.) as f32,
corner_radius, radius,
clip_to_geometry, clip_to_geometry,
alpha, alpha,
); );
@@ -683,13 +682,7 @@ impl<W: LayoutElement> Tile<W> {
.render(renderer, window_render_loc, scale, alpha, target); .render(renderer, window_render_loc, scale, alpha, target);
let geo = Rectangle::from_loc_and_size(window_render_loc, window_size); let geo = Rectangle::from_loc_and_size(window_render_loc, window_size);
let radius = radius.fit_to(window_size.w as f32, window_size.h as f32);
let rules = self.window.rules();
let clip_to_geometry = !self.is_fullscreen && rules.clip_to_geometry == Some(true);
let radius = rules
.geometry_corner_radius
.unwrap_or_default()
.fit_to(window_size.w as f32, window_size.h as f32);
let clip_shader = ClippedSurfaceRenderElement::shader(renderer).cloned(); let clip_shader = ClippedSurfaceRenderElement::shader(renderer).cloned();
let has_border_shader = BorderRenderElement::has_shader(renderer); let has_border_shader = BorderRenderElement::has_shader(renderer);