diff options
| author | Ivan Molodetskikh <yalterz@gmail.com> | 2025-02-07 09:36:08 +0300 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2025-02-07 10:03:38 +0300 |
| commit | acc9d3e4092a519474e9c0d5382e60143598cae1 (patch) | |
| tree | 1826ed87e2371cb3ef7e9a709b1d7254b95e5c6b /src | |
| parent | 0c59fc304c86e20b07e44c09d49a6798300e3957 (diff) | |
| download | niri-acc9d3e4092a519474e9c0d5382e60143598cae1.tar.gz niri-acc9d3e4092a519474e9c0d5382e60143598cae1.tar.bz2 niri-acc9d3e4092a519474e9c0d5382e60143598cae1.zip | |
layout/scrolling: Extract variable
Diffstat (limited to 'src')
| -rw-r--r-- | src/layout/scrolling.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/layout/scrolling.rs b/src/layout/scrolling.rs index 349a0e02..8ecd0ec1 100644 --- a/src/layout/scrolling.rs +++ b/src/layout/scrolling.rs @@ -424,8 +424,10 @@ impl<W: LayoutElement> ScrollingSpace<W> { ) -> Size<i32, Logical> { let border = rules.border.resolve_against(self.options.border); + let working_size = self.working_area.size; + let width = if let Some(size) = width { - let size = match resolve_preset_size(size, &self.options, self.working_area.size.w) { + let size = match resolve_preset_size(size, &self.options, working_size.w) { ResolvedSize::Tile(mut size) => { if !border.off { size -= border.width.0 * 2.; @@ -446,8 +448,7 @@ impl<W: LayoutElement> ScrollingSpace<W> { } let height = if let Some(height) = height { - let height = match resolve_preset_size(height, &self.options, self.working_area.size.h) - { + let height = match resolve_preset_size(height, &self.options, working_size.h) { ResolvedSize::Tile(mut size) => { if !border.off { size -= border.width.0 * 2.; |
