diff options
| author | Ivan Molodetskikh <yalterz@gmail.com> | 2024-12-27 09:58:22 +0300 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2024-12-30 20:12:37 +0300 |
| commit | 99c0fabee658d3b1fc0fd3faf6741afd344d8dab (patch) | |
| tree | 4d0de4941355596af69cc2ee83fe86ed1ae3f423 | |
| parent | fc99724aba1c0043eda3ad1b9829da8ae802d310 (diff) | |
| download | niri-99c0fabee658d3b1fc0fd3faf6741afd344d8dab.tar.gz niri-99c0fabee658d3b1fc0fd3faf6741afd344d8dab.tar.bz2 niri-99c0fabee658d3b1fc0fd3faf6741afd344d8dab.zip | |
layout: Use new helper function
| -rw-r--r-- | src/layout/workspace.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/layout/workspace.rs b/src/layout/workspace.rs index 4ade1757..a9ba091b 100644 --- a/src/layout/workspace.rs +++ b/src/layout/workspace.rs @@ -25,7 +25,10 @@ use crate::render_helpers::renderer::NiriRenderer; use crate::render_helpers::RenderTarget; use crate::utils::id::IdCounter; use crate::utils::transaction::{Transaction, TransactionBlocker}; -use crate::utils::{ensure_min_max_size, output_size, send_scale_transform, ResizeEdge}; +use crate::utils::{ + ensure_min_max_size, ensure_min_max_size_maybe_zero, output_size, send_scale_transform, + ResizeEdge, +}; use crate::window::ResolvedWindowRules; #[derive(Debug)] @@ -729,9 +732,7 @@ impl<W: LayoutElement> Workspace<W> { // size. This is to ensure that a fixed-size window rule works on open, while still // allowing the window freedom to pick its default size otherwise. let (min_size, max_size) = rules.apply_min_max_size(min_size, max_size); - if size.w > 0 || min_size.w == max_size.w { - size.w = ensure_min_max_size(size.w, min_size.w, max_size.w); - } + size.w = ensure_min_max_size_maybe_zero(size.w, min_size.w, max_size.w); // For scrolling (where height is > 0) only ensure fixed height, since at runtime scrolling // will only honor fixed height currently. if min_size.h == max_size.h { |
