From acc9d3e4092a519474e9c0d5382e60143598cae1 Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Fri, 7 Feb 2025 09:36:08 +0300 Subject: layout/scrolling: Extract variable --- src/layout/scrolling.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/layout') 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 ScrollingSpace { ) -> Size { 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 ScrollingSpace { } 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.; -- cgit