Merge pull request #30 from yilozt/reset-prefs-dialog

Reset prefs dialog & Default shadow style

Author: yilozt

resources/schemas/org.gnome.shell.extensions.rounded-window-corners.gschema.xml

@@ -10,7 +10,7 @@
     </key>
 
     <key name="black-list" type="as">
-      <default>["qq.exe", "tim.exe"]</default>
+      <default>[]</default>
       <summary>window here will not be rounded</summary>
       <description>
         The contents of the list represent the instance part of the window's
@@ -74,10 +74,10 @@
       <default>
         {
           'horizontal_offset': 0,
-          'vertical_offset': 41,
-          'blur_offset': 38,
-          'spread_radius': -15,
-          'opacity': 53
+          'vertical_offset': 4,
+          'blur_offset': 28,
+          'spread_radius': 4,
+          'opacity': 60
         }
       </default>
     </key>
@@ -87,10 +87,10 @@
       <default>
         {
           'horizontal_offset': 0,
-          'vertical_offset': 10,
-          'blur_offset': 9,
-          'spread_radius': -5,
-          'opacity': 62
+          'vertical_offset': 2,
+          'blur_offset': 12,
+          'spread_radius': -1,
+          'opacity': 65
         }
       </default>
     </key>

resources/stylesheet-prefs.css

@@ -9,4 +9,16 @@
 
 .rotated {
     transform: rotate(90deg);
+}
+
+.dialog-vbox {
+    padding: 48px;
+}
+
+.dialog-vbox .heading {
+    padding-bottom: 24px;
+}
+
+.dialog-vbox checkbutton {
+    padding-right: 12px;
 }

src/manager/rounded-corners-manager.ts

@@ -259,7 +259,14 @@ export class RoundedCornersManager {
         })
         ;(shadow.first_child as Bin).add_style_class_name ('shadow')
 
-        this._update_shadow_actor_style (actor.meta_window, shadow)
+        this._update_shadow_actor_style (
+            actor.meta_window,
+            shadow,
+            this.global_rounded_corners?.border_radius,
+            actor.meta_window.appears_focused
+                ? settings ().focused_shadow
+                : settings ().unfocused_shadow
+        )
 
         // We have to clip the shadow because of this issues:
         // https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/4474
@@ -429,6 +436,7 @@ export class RoundedCornersManager {
 
             // Update shadows and rounded corners bounds
             this.on_size_changed (actor)
+            this._on_focus_changed (actor.meta_window)
 
             // Connect signals of window, those signals will be disconnected
             // when window is destroyed

src/preferences/pages/general.ts

@@ -5,12 +5,14 @@ import * as Gio            from '@gi/Gio'
 
 // local modules
 import settings            from '../../utils/settings'
+import { SchemasKeys }     from '../../utils/settings'
 import connections         from '../../utils/connections'
 import { list_children }   from '../../utils/prefs'
 import { template_url }    from '../../utils/io'
 import { _log }            from '../../utils/log'
 import RoundedCornersItems from '../widgets/rounded-corners-item'
 import EditShadowWindow    from '../widgets/edit-shadow-window'
+import ResetDialog         from '../widgets/reset-dialog'
 
 // types
 import * as Gtk            from '@gi/Gtk'
@@ -32,6 +34,7 @@ export default GObject.registerClass (
             'border_color_button',
             'edit_shadow_row',
             'applications_group',
+            'reset_preferences_btn',
         ],
     },
     class extends Gtk.Box {
@@ -44,18 +47,26 @@ export default GObject.registerClass (
         private _border_color_button               !: Gtk.ColorButton
         private _edit_shadow_row                   !: Gtk.ListBoxRow
         private _applications_group                !: Gtk.ListBox
+        private _reset_preferences_btn             !: Gtk.Button
 
         private config_items                       !: _Items
-        private edit_shadow_window                 !: _Win
 
         _init () {
             super._init ()
 
-            this.edit_shadow_window = new EditShadowWindow ()
             this.config_items = new RoundedCornersItems ()
 
             this.build_ui ()
 
+            connections
+                .get ()
+                .connect (
+                    settings ().g_settings,
+                    'changed',
+                    (settings: Gio.Settings, key: string) =>
+                        this._on_settings_changed (key)
+                )
+
             settings ().bind (
                 'debug-mode',
                 this._enable_log_switch,
@@ -125,6 +136,12 @@ export default GObject.registerClass (
                         }
                     }
                 )
+
+            connections
+                .get ()
+                .connect (this._reset_preferences_btn, 'clicked', () => {
+                    new ResetDialog ().show ()
+                })
         }
 
         vfunc_root (): void {
@@ -155,17 +172,42 @@ export default GObject.registerClass (
 
         /** Called when click 'Window Shadow' action row */
         _show_edit_shadow_window_cb () {
-            const win = this.root as Gtk.Window
-            this.edit_shadow_window.application = win.application
-            this.edit_shadow_window.present ()
-            win.hide ()
-            this.edit_shadow_window.connect ('close-request', () => {
-                win.show ()
-                this.edit_shadow_window.hide ()
+            const root = this.root as Gtk.Window
+            const win = new EditShadowWindow ()
+            win.application = root.application
+            win.present ()
+            root.hide ()
+            win.connect ('close-request', () => {
+                root.show ()
+                win.destroy ()
             })
         }
+
+        /** Update UI when settings changed  */
+        private _on_settings_changed (key: string) {
+            switch (key as SchemasKeys) {
+            case 'border-color':
+                {
+                    const color = settings ().border_color
+                    this._border_color_button.rgba = new Gdk.RGBA ({
+                        red: color[0],
+                        green: color[1],
+                        blue: color[2],
+                        alpha: color[3],
+                    })
+                }
+                break
+            case 'border-width':
+                this._border_width_ajustment.value = settings ().border_width
+                break
+            case 'global-rounded-corner-settings':
+                this.config_items.cfg =
+                        settings ().global_rounded_corner_settings
+                break
+            default:
+            }
+        }
     }
 )
 
 type _Items = InstanceType<typeof RoundedCornersItems>
-type _Win = InstanceType<typeof EditShadowWindow>

src/preferences/pages/general.ui

@@ -271,6 +271,24 @@
         </child>
       </object>
     </child>
+    <child>
+      <object class="GtkLabel">
+        <property name="halign">start</property>
+        <property name="label" translatable="yes">Reset Preferences</property>
+        <style>
+          <class name="heading" />
+        </style>
+      </object>
+    </child>
+    <child>
+      <object class="GtkButton" id="reset_preferences_btn">
+        <property name="label">Reset Preferences</property>
+        <property name="halign">start</property>
+        <style>
+          <class name="destructive-action"/>
+        </style>
+      </object>
+    </child>
   </template>
 
   <object class="GtkAdjustment" id="border_width_ajustment">

src/preferences/widgets/edit-shadow-window.ts

@@ -147,10 +147,6 @@ export default registerClass (
 
         // signal handles
 
-        _hide_window_cb () {
-            this.hide ()
-        }
-
         on_value_changed () {
             this.update_cfg ()
             this.update_style ()