From 66c792bd837a5e610e279086031b3ca8dcad99e3 Mon Sep 17 00:00:00 2001 From: Jenyyk Date: Tue, 14 Jan 2025 14:25:18 +0100 Subject: [PATCH 1/7] dev: picking custom colors for individual windows --- po/ar.po | 15 +++++------ po/cs.po | 15 +++++------ po/de.po | 15 +++++------ po/eo.po | 15 +++++------ po/es.po | 15 +++++------ po/et.po | 15 +++++------ po/fi.po | 15 +++++------ po/fr.po | 15 +++++------ po/hu.po | 15 +++++------ po/id.po | 15 +++++------ po/it.po | 15 +++++------ po/ja.po | 15 +++++------ po/nb_NO.po | 15 +++++------ po/nl.po | 15 +++++------ po/pl.po | 15 +++++------ po/pt.po | 15 +++++------ po/pt_BR.po | 15 +++++------ po/rounded-window-corners@fxgn.pot | 17 +++++++------ po/ru.po | 15 +++++------ po/tr.po | 15 +++++------ po/uk.po | 15 +++++------ po/zh_CN.po | 15 +++++------ ....rounded-window-corners-reborn.gschema.xml | 5 ++-- src/effect/rounded_corners_effect.ts | 3 ++- src/preferences/pages/custom.ts | 25 +++++++++++++++++++ src/preferences/pages/general.ts | 15 +++++------ .../widgets/custom_settings_row.ts | 14 +++++++++++ src/utils/settings.ts | 2 ++ src/utils/types.ts | 2 ++ 29 files changed, 233 insertions(+), 165 deletions(-) diff --git a/po/ar.po b/po/ar.po index b588887..dd19a24 100644 --- a/po/ar.po +++ b/po/ar.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: 12\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-12-25 13:30+0300\n" +"POT-Creation-Date: 2025-01-14 10:38+0100\n" "PO-Revision-Date: 2023-12-10 10:05+0000\n" "Last-Translator: Nadjib Chergui \n" "Language-Team: Arabic \n" "Language-Team: Czech \n" "Language-Team: German \n" "Language-Team: Esperanto \n" "Language-Team: Spanish \n" "Language-Team: Finnish \n" "Language-Team: French \n" "Language-Team: Hungarian \n" "Language-Team: Indonesian \n" "Language-Team: Italian \n" "Language-Team: Japanese \n" "Language-Team: Norwegian Bokmål \n" "Language-Team: Dutch \n" "Language-Team: Polish \n" "Language-Team: Portuguese \n" "Language-Team: Portuguese (Brazil) \n" "Language-Team: LANGUAGE \n" "Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" #: src/preferences/pages/blacklist.ui:6 src/preferences/pages/blacklist.ui:10 @@ -120,16 +120,17 @@ msgid "Border width" msgstr "" #: src/preferences/pages/general.ui:57 src/preferences/pages/general.ui:65 +#: src/preferences/widgets/custom_settings_row.ts:19 msgid "Border color" msgstr "" #: src/preferences/pages/general.ui:74 -#: src/preferences/widgets/custom_settings_row.ts:19 +#: src/preferences/widgets/custom_settings_row.ts:27 msgid "Corner radius" msgstr "" #: src/preferences/pages/general.ui:101 -#: src/preferences/widgets/custom_settings_row.ts:29 +#: src/preferences/widgets/custom_settings_row.ts:37 msgid "Corner smoothing" msgstr "" @@ -246,19 +247,19 @@ msgstr "" msgid "Enabled" msgstr "" -#: src/preferences/widgets/custom_settings_row.ts:39 +#: src/preferences/widgets/custom_settings_row.ts:47 msgid "Keep rounded corners when maximized" msgstr "" -#: src/preferences/widgets/custom_settings_row.ts:41 +#: src/preferences/widgets/custom_settings_row.ts:49 msgid "Always clip rounded corners even if window is maximized or tiled" msgstr "" -#: src/preferences/widgets/custom_settings_row.ts:45 +#: src/preferences/widgets/custom_settings_row.ts:53 msgid "Keep rounded corners when in fullscreen" msgstr "" -#: src/preferences/widgets/custom_settings_row.ts:46 +#: src/preferences/widgets/custom_settings_row.ts:54 msgid "Always clip rounded corners even for fullscreen window" msgstr "" diff --git a/po/ru.po b/po/ru.po index 094ec98..8bed41f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-12-25 13:30+0300\n" +"POT-Creation-Date: 2025-01-14 10:38+0100\n" "PO-Revision-Date: 2023-03-09 15:37+0000\n" "Last-Translator: Evgeniy Khramov \n" "Language-Team: Russian \n" "Language-Team: Turkish \n" "Language-Team: Ukrainian \n" "Language-Team: Chinese (Simplified) 0 - + [] window here will not be rounded @@ -39,7 +39,7 @@ Border color for rounded corners window (0.5, 0.5, 0.5, 1.0) - + Global rounded corners settings for all windows @@ -61,6 +61,7 @@ }>, 'borderRadius': <uint32 12>, 'smoothing': <0>, + 'borderColor': <[0.0, 0.0, 0.0, 1.0]>, 'enabled': <true> } diff --git a/src/effect/rounded_corners_effect.ts b/src/effect/rounded_corners_effect.ts index 57ad3e3..9bc9c0e 100644 --- a/src/effect/rounded_corners_effect.ts +++ b/src/effect/rounded_corners_effect.ts @@ -67,7 +67,8 @@ export const RoundedCornersEffect = GObject.registerClass( windowBounds: Bounds, ) { const borderWidth = getPref('border-width') * scaleFactor; - const borderColor = getPref('border-color'); + const borderColor = config.borderColor; + // something should probably be set up here const outerRadius = config.borderRadius * scaleFactor; const {padding, smoothing} = config; diff --git a/src/preferences/pages/custom.ts b/src/preferences/pages/custom.ts index 65a9c0d..7311b73 100644 --- a/src/preferences/pages/custom.ts +++ b/src/preferences/pages/custom.ts @@ -5,6 +5,7 @@ */ import Adw from 'gi://Adw'; +import Gdk from 'gi://Gdk'; import GLib from 'gi://GLib'; import GObject from 'gi://GObject'; @@ -147,6 +148,30 @@ export const CustomPage = GObject.registerClass( this.#customWindowSettings, ); }); + + const colorArray = this.#customWindowSettings[wmClass].borderColor || [0, 0, 0, 1]; + const rgba = new Gdk.RGBA() + rgba.red = colorArray[0], + rgba.green = colorArray[1], + rgba.blue = colorArray[2], + rgba.alpha = colorArray[3], + r.borderColorButton.set_rgba( + rgba, + ); + r.borderColorButton.connect('notify::rgba', (button: Gtk.ColorDialogButton) => { + const color = r.borderColorButton.get_rgba(); + this.#customWindowSettings[wmClass].borderColor = [ + color.red, + color.green, + color.blue, + color.alpha, + ]; + setPref( + 'custom-rounded-corner-settings', + this.#customWindowSettings, + ); + }); + r.cornerRadius.set_value( this.#customWindowSettings[wmClass].borderRadius, ); diff --git a/src/preferences/pages/general.ts b/src/preferences/pages/general.ts index cb8c7dc..7386f52 100644 --- a/src/preferences/pages/general.ts +++ b/src/preferences/pages/general.ts @@ -85,18 +85,19 @@ export const GeneralPage = GObject.registerClass( const color = new Gdk.RGBA(); [color.red, color.green, color.blue, color.alpha] = - getPref('border-color'); + this.#settings.borderColor; this._borderColor.set_rgba(color); this._borderColor.connect( 'notify::rgba', (button: Gtk.ColorDialogButton) => { const color = button.get_rgba(); - setPref('border-color', [ - color.red, - color.green, - color.blue, - color.alpha, - ]); + this.#settings.borderColor = [ + color.red, + color.green, + color.blue, + color.alpha, + ]; + this.#updateGlobalConfig(); }, ); diff --git a/src/preferences/widgets/custom_settings_row.ts b/src/preferences/widgets/custom_settings_row.ts index 39ea1c7..e3aee8d 100644 --- a/src/preferences/widgets/custom_settings_row.ts +++ b/src/preferences/widgets/custom_settings_row.ts @@ -15,6 +15,14 @@ export class CustomSettingsRowClass extends AppRowClass { title: _('Enabled'), }); + #borderColorRow = new Adw.ActionRow({ + title: _('Border color'), + }); + borderColorButton = new Gtk.ColorDialogButton({ + valign: Gtk.Align.CENTER, + }); + borderColorDialog = new Gtk.ColorDialog(); + #cornerRadiusRow = new Adw.ActionRow({ title: _('Corner radius'), }); @@ -49,6 +57,10 @@ export class CustomSettingsRowClass extends AppRowClass { constructor(cb: AppRowCallbacks) { super(cb); + + this.#borderColorRow.add_suffix(this.borderColorButton); + this.borderColorButton.set_dialog(this.borderColorDialog); + this.#cornerRadiusRow.add_suffix( new Gtk.Scale({ valign: Gtk.Align.CENTER, @@ -74,6 +86,7 @@ export class CustomSettingsRowClass extends AppRowClass { ); this.add_row(this.enabledRow); + this.add_row(this.#borderColorRow); this.add_row(this.#cornerRadiusRow); this.add_row(this.#cornerSmoothingRow); this.add_row(this.keepForMaximized); @@ -98,6 +111,7 @@ export class CustomSettingsRowClass extends AppRowClass { } private toggleSensitivity(state: boolean) { + this.#borderColorRow.set_sensitive(state); this.#cornerRadiusRow.set_sensitive(state); this.#cornerSmoothingRow.set_sensitive(state); this.keepForMaximized.set_sensitive(state); diff --git a/src/utils/settings.ts b/src/utils/settings.ts index 0c39bec..1ca2f81 100644 --- a/src/utils/settings.ts +++ b/src/utils/settings.ts @@ -159,6 +159,7 @@ function packRoundedCornerSettings(settings: RoundedCornerSettings) { ); const borderRadius = GLib.Variant.new_uint32(settings.borderRadius); const smoothing = GLib.Variant.new_double(settings.smoothing); + const borderColor = new GLib.Variant('(dddd)', settings.borderColor); const enabled = GLib.Variant.new_boolean(settings.enabled); const variantObject = { @@ -166,6 +167,7 @@ function packRoundedCornerSettings(settings: RoundedCornerSettings) { keepRoundedCorners: keepRoundedCorners, borderRadius: borderRadius, smoothing: smoothing, + borderColor: borderColor, enabled: enabled, }; diff --git a/src/utils/types.ts b/src/utils/types.ts index 6a4d04d..90c5687 100644 --- a/src/utils/types.ts +++ b/src/utils/types.ts @@ -2,6 +2,7 @@ import type Meta from 'gi://Meta'; import type St from 'gi://St'; +import Gdk from 'gi://Gdk'; /** Bounds of rounded corners */ export type Bounds = { @@ -25,6 +26,7 @@ export type RoundedCornerSettings = { top: number; bottom: number; }; + borderColor: [number, number, number, number]; enabled: boolean; }; From dcece463249976df34d0803d826bc486f02e50bc Mon Sep 17 00:00:00 2001 From: Jenyyk Date: Wed, 15 Jan 2025 09:57:40 +0100 Subject: [PATCH 2/7] fix: remove redundant key from schema --- po/rounded-window-corners@fxgn.pot | 2 +- ...hell.extensions.rounded-window-corners-reborn.gschema.xml | 5 ----- src/effect/rounded_corners_effect.ts | 1 - src/utils/types.ts | 1 - 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/po/rounded-window-corners@fxgn.pot b/po/rounded-window-corners@fxgn.pot index 92f98fb..402b24d 100644 --- a/po/rounded-window-corners@fxgn.pot +++ b/po/rounded-window-corners@fxgn.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-01-14 23:02+0100\n" +"POT-Creation-Date: 2025-01-15 10:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/resources/schemas/org.gnome.shell.extensions.rounded-window-corners-reborn.gschema.xml b/resources/schemas/org.gnome.shell.extensions.rounded-window-corners-reborn.gschema.xml index 62af706..e69220b 100644 --- a/resources/schemas/org.gnome.shell.extensions.rounded-window-corners-reborn.gschema.xml +++ b/resources/schemas/org.gnome.shell.extensions.rounded-window-corners-reborn.gschema.xml @@ -35,11 +35,6 @@ 0 - - Border color for rounded corners window - (0.5, 0.5, 0.5, 1.0) - - Global rounded corners settings for all windows diff --git a/src/effect/rounded_corners_effect.ts b/src/effect/rounded_corners_effect.ts index 9bc9c0e..b2864ed 100644 --- a/src/effect/rounded_corners_effect.ts +++ b/src/effect/rounded_corners_effect.ts @@ -68,7 +68,6 @@ export const RoundedCornersEffect = GObject.registerClass( ) { const borderWidth = getPref('border-width') * scaleFactor; const borderColor = config.borderColor; - // something should probably be set up here const outerRadius = config.borderRadius * scaleFactor; const {padding, smoothing} = config; diff --git a/src/utils/types.ts b/src/utils/types.ts index 90c5687..76f25a1 100644 --- a/src/utils/types.ts +++ b/src/utils/types.ts @@ -2,7 +2,6 @@ import type Meta from 'gi://Meta'; import type St from 'gi://St'; -import Gdk from 'gi://Gdk'; /** Bounds of rounded corners */ export type Bounds = { From a57fb9e936d68fd0faf6084cc52333c20cc7fd63 Mon Sep 17 00:00:00 2001 From: Jenyyk Date: Thu, 30 Jan 2025 15:37:48 +0100 Subject: [PATCH 3/7] fix: color array fix --- src/preferences/pages/custom.ts | 46 ++++++++++--------- src/preferences/pages/general.ts | 8 ++-- .../widgets/custom_settings_row.ts | 2 +- 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/src/preferences/pages/custom.ts b/src/preferences/pages/custom.ts index 7311b73..4d37993 100644 --- a/src/preferences/pages/custom.ts +++ b/src/preferences/pages/custom.ts @@ -5,9 +5,9 @@ */ import Adw from 'gi://Adw'; -import Gdk from 'gi://Gdk'; import GLib from 'gi://GLib'; import GObject from 'gi://GObject'; +import Gdk from 'gi://Gdk'; import {gettext as _} from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js'; import {getPref, setPref} from '../../utils/settings.js'; @@ -149,28 +149,30 @@ export const CustomPage = GObject.registerClass( ); }); - const colorArray = this.#customWindowSettings[wmClass].borderColor || [0, 0, 0, 1]; - const rgba = new Gdk.RGBA() - rgba.red = colorArray[0], - rgba.green = colorArray[1], - rgba.blue = colorArray[2], - rgba.alpha = colorArray[3], - r.borderColorButton.set_rgba( - rgba, + const colorArray = this.#customWindowSettings[wmClass] + .borderColor || [0, 0, 0, 1]; + const rgba = new Gdk.RGBA(); + rgba.red = colorArray[0]; + rgba.green = colorArray[1]; + rgba.blue = colorArray[2]; + rgba.alpha = colorArray[3]; + r.borderColorButton.set_rgba(rgba); + r.borderColorButton.connect( + 'notify::rgba', + (_button: Gtk.ColorDialogButton) => { + const color = r.borderColorButton.get_rgba(); + this.#customWindowSettings[wmClass].borderColor = [ + color.red, + color.green, + color.blue, + color.alpha, + ]; + setPref( + 'custom-rounded-corner-settings', + this.#customWindowSettings, + ); + }, ); - r.borderColorButton.connect('notify::rgba', (button: Gtk.ColorDialogButton) => { - const color = r.borderColorButton.get_rgba(); - this.#customWindowSettings[wmClass].borderColor = [ - color.red, - color.green, - color.blue, - color.alpha, - ]; - setPref( - 'custom-rounded-corner-settings', - this.#customWindowSettings, - ); - }); r.cornerRadius.set_value( this.#customWindowSettings[wmClass].borderRadius, diff --git a/src/preferences/pages/general.ts b/src/preferences/pages/general.ts index 7386f52..a0a2f20 100644 --- a/src/preferences/pages/general.ts +++ b/src/preferences/pages/general.ts @@ -92,10 +92,10 @@ export const GeneralPage = GObject.registerClass( (button: Gtk.ColorDialogButton) => { const color = button.get_rgba(); this.#settings.borderColor = [ - color.red, - color.green, - color.blue, - color.alpha, + color.red, + color.green, + color.blue, + color.alpha, ]; this.#updateGlobalConfig(); }, diff --git a/src/preferences/widgets/custom_settings_row.ts b/src/preferences/widgets/custom_settings_row.ts index e3aee8d..a4aba08 100644 --- a/src/preferences/widgets/custom_settings_row.ts +++ b/src/preferences/widgets/custom_settings_row.ts @@ -19,7 +19,7 @@ export class CustomSettingsRowClass extends AppRowClass { title: _('Border color'), }); borderColorButton = new Gtk.ColorDialogButton({ - valign: Gtk.Align.CENTER, + valign: Gtk.Align.CENTER, }); borderColorDialog = new Gtk.ColorDialog(); From d0c712295dacb5a2b97088a15d1133fd69c486a5 Mon Sep 17 00:00:00 2001 From: Jenyyk Date: Thu, 30 Jan 2025 16:01:19 +0100 Subject: [PATCH 4/7] fix: revert to old default color --- ...e.shell.extensions.rounded-window-corners-reborn.gschema.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/schemas/org.gnome.shell.extensions.rounded-window-corners-reborn.gschema.xml b/resources/schemas/org.gnome.shell.extensions.rounded-window-corners-reborn.gschema.xml index e69220b..bffc4af 100644 --- a/resources/schemas/org.gnome.shell.extensions.rounded-window-corners-reborn.gschema.xml +++ b/resources/schemas/org.gnome.shell.extensions.rounded-window-corners-reborn.gschema.xml @@ -56,7 +56,7 @@ }>, 'borderRadius': <uint32 12>, 'smoothing': <0>, - 'borderColor': <[0.0, 0.0, 0.0, 1.0]>, + 'borderColor': <[0.5, 0.5, 0.5, 1.0]>, 'enabled': <true> } From 22806adf1b686f0251df1a0bcdcba01a88766592 Mon Sep 17 00:00:00 2001 From: Userjoke <123212079+Jenyyk@users.noreply.github.com> Date: Thu, 30 Jan 2025 20:08:11 +0100 Subject: [PATCH 5/7] fix: schema version bump, outdated key reset --- src/utils/settings.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/utils/settings.ts b/src/utils/settings.ts index 1ca2f81..04b94e9 100644 --- a/src/utils/settings.ts +++ b/src/utils/settings.ts @@ -122,7 +122,7 @@ export function bindPref( * @param prefs the GSettings object to clean. */ function resetOutdated(prefs: Gio.Settings) { - const lastVersion = 6; + const lastVersion = 7; const currentVersion = prefs .get_user_value('settings-version') ?.recursiveUnpack(); @@ -133,6 +133,7 @@ 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'); prefs.set_uint('settings-version', lastVersion); From 10cf753f4f455705923b503945320475fbb1dc93 Mon Sep 17 00:00:00 2001 From: Jenyyk Date: Fri, 31 Jan 2025 09:08:16 +0100 Subject: [PATCH 6/7] refactor: color array refactor --- po/rounded-window-corners@fxgn.pot | 2 +- src/preferences/pages/custom.ts | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/po/rounded-window-corners@fxgn.pot b/po/rounded-window-corners@fxgn.pot index 402b24d..34d5062 100644 --- a/po/rounded-window-corners@fxgn.pot +++ b/po/rounded-window-corners@fxgn.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-01-15 10:04+0100\n" +"POT-Creation-Date: 2025-01-31 09:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/preferences/pages/custom.ts b/src/preferences/pages/custom.ts index 4d37993..660c98a 100644 --- a/src/preferences/pages/custom.ts +++ b/src/preferences/pages/custom.ts @@ -149,14 +149,11 @@ export const CustomPage = GObject.registerClass( ); }); - const colorArray = this.#customWindowSettings[wmClass] - .borderColor || [0, 0, 0, 1]; - const rgba = new Gdk.RGBA(); - rgba.red = colorArray[0]; - rgba.green = colorArray[1]; - rgba.blue = colorArray[2]; - rgba.alpha = colorArray[3]; - r.borderColorButton.set_rgba(rgba); + const color = new Gdk.RGBA(); + [color.red, color.green, color.blue, color.alpha] = + this.#customWindowSettings[wmClass].borderColor; + + r.borderColorButton.set_rgba(color); r.borderColorButton.connect( 'notify::rgba', (_button: Gtk.ColorDialogButton) => { From 64b290093a5d2b0571d134a8ef38f0b1d81857df Mon Sep 17 00:00:00 2001 From: flexagoon Date: Sat, 15 Feb 2025 17:27:41 +0300 Subject: [PATCH 7/7] more schema-related fixes --- src/manager/event_handlers.ts | 1 - src/preferences/pages/reset.ts | 2 +- src/utils/settings.ts | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/manager/event_handlers.ts b/src/manager/event_handlers.ts index 1f20e35..d2f948b 100644 --- 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 index 427bc74..f918b8e 100644 --- a/src/preferences/pages/reset.ts +++ b/src/preferences/pages/reset.ts @@ -51,10 +51,10 @@ 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', + borderColor: 'Border Color', padding: 'Padding', keepRoundedCorners: 'Keep Rounded Corners when Maximized or Fullscreen', diff --git a/src/utils/settings.ts b/src/utils/settings.ts index 04b94e9..a62896d 100644 --- 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,7 +131,9 @@ function resetOutdated(prefs: Gio.Settings) { } prefs.reset('global-rounded-corner-settings'); prefs.reset('custom-rounded-corner-settings'); - prefs.reset('border-color'); + if (prefs.list_keys().includes('border-color')) { + prefs.reset('border-color'); + } prefs.reset('focused-shadow'); prefs.reset('unfocused-shadow'); prefs.set_uint('settings-version', lastVersion);