matugen: remove surface shifting option entirely

Common/SettingsData.qml

@@ -66,7 +66,6 @@ Singleton {
     property real popupTransparency: 1.0
     property real dockTransparency: 1
     property string widgetBackgroundColor: "sch"
-    property string surfaceBase: "s"
     property real cornerRadius: 12
 
     property bool use24HourClock: true
@@ -622,12 +621,6 @@ rm -rf '${home}'/.cache/icon-cache '${home}'/.cache/thumbnails 2>/dev/null || tr
         }
     }
 
-    function setSurfaceBase(base) {
-        set("surfaceBase", base)
-        if (typeof Theme !== "undefined") {
-            Theme.generateSystemThemesFromCurrentTheme()
-        }
-    }
 
     function setCornerRadius(radius) {
         set("cornerRadius", radius)

Common/Theme.qml

@@ -260,12 +260,7 @@ Singleton {
     property color primaryText: currentThemeData.primaryText
     property color primaryContainer: currentThemeData.primaryContainer
     property color secondary: currentThemeData.secondary
-    property color surface: {
-        if (typeof SettingsData !== "undefined" && SettingsData.surfaceBase === "s") {
-            return currentThemeData.background
-        }
-        return currentThemeData.surface
-    }
+    property color surface: currentThemeData.surface
     property color surfaceText: currentThemeData.surfaceText
     property color surfaceVariant: currentThemeData.surfaceVariant
     property color surfaceVariantText: currentThemeData.surfaceVariantText
@@ -274,24 +269,9 @@ Singleton {
     property color backgroundText: currentThemeData.backgroundText
     property color outline: currentThemeData.outline
     property color outlineVariant: currentThemeData.outlineVariant || Qt.rgba(outline.r, outline.g, outline.b, 0.6)
-    property color surfaceContainer: {
-        if (typeof SettingsData !== "undefined" && SettingsData.surfaceBase === "s") {
-            return currentThemeData.surface
-        }
-        return currentThemeData.surfaceContainer
-    }
-    property color surfaceContainerHigh: {
-        if (typeof SettingsData !== "undefined" && SettingsData.surfaceBase === "s") {
-            return currentThemeData.surfaceContainer
-        }
-        return currentThemeData.surfaceContainerHigh
-    }
-    property color surfaceContainerHighest: {
-        if (typeof SettingsData !== "undefined" && SettingsData.surfaceBase === "s") {
-            return currentThemeData.surfaceContainerHigh
-        }
-        return currentThemeData.surfaceContainerHighest
-    }
+    property color surfaceContainer: currentThemeData.surfaceContainer
+    property color surfaceContainerHigh: currentThemeData.surfaceContainerHigh
+    property color surfaceContainerHighest: currentThemeData.surfaceContainerHighest
 
     property color onSurface: surfaceText
     property color onSurfaceVariant: surfaceVariantText
@@ -790,7 +770,6 @@ Singleton {
             "mode": isLight ? "light" : "dark",
             "iconTheme": iconTheme || "System Default",
             "matugenType": matugenType || "scheme-tonal-spot",
-            "surfaceBase": (typeof SettingsData !== "undefined" && SettingsData.surfaceBase) ? SettingsData.surfaceBase : "sc",
             "runUserTemplates": (typeof SettingsData !== "undefined") ? SettingsData.runUserMatugenTemplates : true
         }
 

Common/settings/SettingsSpec.js

@@ -18,7 +18,6 @@ var SPEC = {
     dockTransparency: { def: 1.0, coerce: percentToUnit },
 
     widgetBackgroundColor: { def: "sch" },
-    surfaceBase: { def: "s", onChange: "regenSystemThemes" },
     cornerRadius: { def: 12, onChange: "updateNiriLayout" },
 
     use24HourClock: { def: true },