more schema fixes

flexagoon · Feb 15, 2025 · 43f52e8 · 43f52e8
1 parent 10cf753
commit 43f52e8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/src/manager/event_handlers.ts b/src/manager/event_handlers.ts
@@ -167,7 +167,6 @@ export function onSettingsChanged(key: SchemaKey): void {
             break;
         case 'global-rounded-corner-settings':
         case 'custom-rounded-corner-settings':
-        case 'border-color':
         case 'border-width':
         case 'tweak-kitty-terminal':
             refreshAllRoundedCorners();

diff --git a/src/preferences/pages/reset.ts b/src/preferences/pages/reset.ts
@@ -51,7 +51,6 @@ export const ResetPage = GObject.registerClass(
             'focused-shadow': 'Focus Window Shadow Style',
             'unfocused-shadow': 'Unfocus Window Shadow Style',
             'border-width': 'Border Width',
-            'border-color': 'Border Color',
             'debug-mode': 'Enable Log',
 
             borderRadius: 'Border Radius',

diff --git a/src/utils/settings.ts b/src/utils/settings.ts
@@ -23,7 +23,6 @@ type Schema = {
     'skip-libadwaita-app': boolean;
     'skip-libhandy-app': boolean;
     'border-width': number;
-    'border-color': [number, number, number, number];
     'global-rounded-corner-settings': RoundedCornerSettings;
     'custom-rounded-corner-settings': CustomRoundedCornerSettings;
     'focused-shadow': BoxShadow;
@@ -43,7 +42,6 @@ export const Schema = {
     'skip-libadwaita-app': 'b',
     'skip-libhandy-app': 'b',
     'border-width': 'i',
-    'border-color': '(dddd)',
     'global-rounded-corner-settings': 'a{sv}',
     'custom-rounded-corner-settings': 'a{sv}',
     'focused-shadow': 'a{si}',
@@ -133,9 +131,11 @@ function resetOutdated(prefs: Gio.Settings) {
         }
         prefs.reset('global-rounded-corner-settings');
         prefs.reset('custom-rounded-corner-settings');
-        prefs.reset('border-color');
         prefs.reset('focused-shadow');
         prefs.reset('unfocused-shadow');
+        if (prefs.list_keys().includes('border-color')) {
+            prefs.reset('border-color');
+        }
         prefs.set_uint('settings-version', lastVersion);
     }
 }