From af71ef327697f9ad097255ee4c6b6460dfa12da0 Mon Sep 17 00:00:00 2001
From: Nathan Adams <dinnerbone@dinnerbone.com>
Date: Wed, 5 Jun 2024 12:46:13 +0200
Subject: [PATCH] web: Store StageScaleMode directly in builder, not Option<>

---
 web/src/builder.rs | 12 ++++++------
 web/src/lib.rs     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/web/src/builder.rs b/web/src/builder.rs
index 7b4858271..4f12e04a9 100644
--- a/web/src/builder.rs
+++ b/web/src/builder.rs
@@ -24,7 +24,7 @@ pub struct RuffleInstanceBuilder {
     pub(crate) stage_align: StageAlign,
     pub(crate) force_align: bool,
     pub(crate) quality: Option<StageQuality>,
-    pub(crate) scale: Option<StageScaleMode>,
+    pub(crate) scale: StageScaleMode,
     pub(crate) force_scale: bool,
     pub(crate) frame_rate: Option<f64>,
     pub(crate) wmode: Option<String>, // TODO: Enumify? `Player` is working in strings here too...
@@ -59,7 +59,7 @@ impl Default for RuffleInstanceBuilder {
             stage_align: StageAlign::empty(),
             force_align: false,
             quality: None,
-            scale: None,
+            scale: StageScaleMode::ShowAll,
             force_scale: false,
             frame_rate: None,
             wmode: None,
@@ -174,10 +174,10 @@ impl RuffleInstanceBuilder {
     #[wasm_bindgen(js_name = "setScale")]
     pub fn set_scale(&mut self, value: &str) {
         self.scale = match value {
-            "exactfit" => Some(StageScaleMode::ExactFit),
-            "noborder" => Some(StageScaleMode::NoBorder),
-            "noscale" => Some(StageScaleMode::NoScale),
-            "showall" => Some(StageScaleMode::ShowAll),
+            "exactfit" => StageScaleMode::ExactFit,
+            "noborder" => StageScaleMode::NoBorder,
+            "noscale" => StageScaleMode::NoScale,
+            "showall" => StageScaleMode::ShowAll,
             _ => return,
         };
     }
diff --git a/web/src/lib.rs b/web/src/lib.rs
index d97278eb1..a8a437296 100644
--- a/web/src/lib.rs
+++ b/web/src/lib.rs
@@ -525,7 +525,7 @@ impl RuffleHandle {
             .with_compatibility_rules(config.compatibility_rules)
             .with_quality(config.quality.unwrap_or(default_quality))
             .with_align(config.stage_align, config.force_align)
-            .with_scale_mode(config.scale.unwrap_or_default(), config.force_scale)
+            .with_scale_mode(config.scale, config.force_scale)
             .with_frame_rate(config.frame_rate)
             // FIXME - should this be configurable?
             .with_sandbox_type(SandboxType::Remote)