aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/layout/mod.rs14
-rw-r--r--src/layout/workspace.rs6
2 files changed, 6 insertions, 14 deletions
diff --git a/src/layout/mod.rs b/src/layout/mod.rs
index c58fc284..370640b9 100644
--- a/src/layout/mod.rs
+++ b/src/layout/mod.rs
@@ -2561,13 +2561,6 @@ impl<W: LayoutElement> Layout<W> {
"workspace base options must be synchronized with layout"
);
- let options = Options::clone(&workspace.base_options)
- .adjusted_for_scale(workspace.scale().fractional_scale());
- assert_eq!(
- &*workspace.options, &options,
- "workspace options must be base options adjusted for workspace scale"
- );
-
assert!(
seen_workspace_id.insert(workspace.id()),
"workspace id must be unique"
@@ -2725,13 +2718,6 @@ impl<W: LayoutElement> Layout<W> {
"workspace options must be synchronized with layout"
);
- let options = Options::clone(&workspace.base_options)
- .adjusted_for_scale(workspace.scale().fractional_scale());
- assert_eq!(
- &*workspace.options, &options,
- "workspace options must be base options adjusted for workspace scale"
- );
-
assert!(
seen_workspace_id.insert(workspace.id()),
"workspace id must be unique"
diff --git a/src/layout/workspace.rs b/src/layout/workspace.rs
index 690baf17..d2340949 100644
--- a/src/layout/workspace.rs
+++ b/src/layout/workspace.rs
@@ -1787,6 +1787,12 @@ impl<W: LayoutElement> Workspace<W> {
assert!(scale > 0.);
assert!(scale.is_finite());
+ let options = Options::clone(&self.base_options).adjusted_for_scale(scale);
+ assert_eq!(
+ &*self.options, &options,
+ "options must be base options adjusted for scale"
+ );
+
assert!(self.view_size.w > 0.);
assert!(self.view_size.h > 0.);