feat(YaruWindowControl): follow system settings

Fixes #532

Author: Feichtmeier

lib/src/settings/gtk_constants.dart

@@ -1,2 +1,4 @@
 const kSchemaInterface = 'org.gnome.desktop.interface';
+const kSchemeWmPreferences = 'org.gnome.desktop.wm.preferences';
 const kAccentColorKey = 'accent-color';
+const kButtonLayoutKey = 'button-layout';

lib/src/settings/inherited_theme.dart

@@ -142,33 +142,41 @@ class YaruTheme extends StatefulWidget {
 class _YaruThemeState extends State<YaruTheme> {
   YaruVariant? _variant;
   YaruSettings? _settings;
-  StreamSubscription<String?>? _themeNameSubscription;
-  StreamSubscription<String?>? _accentColorSubScription;
+  final Map<String, List<String>?> _customTitleButtonLayout = {
+    'left': null,
+    'right': null,
+  };
+  StreamSubscription<String?>? _themeNameSub;
+  StreamSubscription<String?>? _accentColorSub;
+  StreamSubscription<String?>? _buttonLayoutSub;
 
   @override
   void initState() {
     super.initState();
-    if (widget.data.variant == null && canDetectVariant()) {
+    if (canDetectGnome()) {
       _settings = widget._settings ?? YaruSettings();
       _settings?.init();
-      _variant = resolveAccentColorVariant(_settings?.getAccentColor()) ??
-          resolveGtkThemeVariant(_settings?.getThemeName());
-      _accentColorSubScription ??=
-          _settings!.accentColorChanged.listen(updateVariant);
-      _themeNameSubscription ??=
-          _settings!.themeNameChanged.listen(updateVariant);
+      if (widget.data.variant == null) {
+        _variant = resolveAccentColorVariant(_settings?.getAccentColor()) ??
+            resolveGtkThemeVariant(_settings?.getThemeName());
+        _accentColorSub ??= _settings!.accentColorChanged.listen(updateVariant);
+        _themeNameSub ??= _settings!.themeNameChanged.listen(updateVariant);
+        _buttonLayoutSub ??=
+            _settings!.buttonLayoutChanged.listen(updateButtonLayout);
+      }
     }
   }
 
   @override
   void dispose() {
-    _themeNameSubscription?.cancel();
-    _accentColorSubScription?.cancel();
+    _themeNameSub?.cancel();
+    _accentColorSub?.cancel();
+    _buttonLayoutSub?.cancel();
     _settings?.dispose();
     super.dispose();
   }
 
-  bool canDetectVariant() {
+  bool canDetectGnome() {
     return !kIsWeb &&
         widget._platform.isLinux &&
         !widget._platform.environment.containsKey('FLUTTER_TEST');
@@ -221,7 +229,7 @@ class _YaruThemeState extends State<YaruTheme> {
       };
 
   void updateVariant([String? value]) {
-    assert(canDetectVariant());
+    assert(canDetectGnome());
     final gtkThemeName = value ?? _settings?.getThemeName();
     final accentColor = value ?? _settings?.getAccentColor();
     setState(
@@ -230,6 +238,24 @@ class _YaruThemeState extends State<YaruTheme> {
     );
   }
 
+  void updateButtonLayout([String? value]) {
+    assert(canDetectGnome());
+    final buttonLayout = value ?? _settings?.getButtonLayout();
+
+    final buttons = buttonLayout?.split(':');
+
+    setState(() {
+      _customTitleButtonLayout.update(
+        'left',
+        (value) => buttons?.firstOrNull?.split(',') ?? <String>[],
+      );
+      _customTitleButtonLayout.update(
+        'right',
+        (value) => buttons?.lastOrNull?.split(',') ?? [],
+      );
+    });
+  }
+
   ThemeMode resolveMode() {
     final mode = widget.data.themeMode ?? ThemeMode.system;
     if (mode == ThemeMode.system) {
@@ -246,6 +272,8 @@ class _YaruThemeState extends State<YaruTheme> {
       highContrast:
           widget.data.highContrast ?? MediaQuery.highContrastOf(context),
       themeMode: resolveMode(),
+      customTitleButtonLayout:
+          widget.data.customTitleButtonLayout ?? _customTitleButtonLayout,
     );
   }
 
@@ -262,7 +290,7 @@ class _YaruThemeState extends State<YaruTheme> {
 
   @override
   Widget build(BuildContext context) {
-    if (_settings != null && _themeNameSubscription == null) {
+    if (_settings != null && _themeNameSub == null) {
       return const SizedBox.shrink(); // #231
     }
     final data = resolveData();
@@ -287,11 +315,14 @@ class YaruThemeData with Diagnosticable {
     this.pageTransitionsTheme,
     this.useMaterial3,
     this.visualDensity,
+    this.customTitleButtonLayout,
   });
 
   /// Specifies the theme variant.
   final YaruVariant? variant;
 
+  final Map<String, List<String>?>? customTitleButtonLayout;
+
   /// Whether to use high contrast colors.
   final bool? highContrast;
 
@@ -328,6 +359,7 @@ class YaruThemeData with Diagnosticable {
     PageTransitionsTheme? pageTransitionsTheme,
     bool? useMaterial3,
     VisualDensity? visualDensity,
+    Map<String, List<String>?>? customTitleButtonLayout,
   }) {
     return YaruThemeData(
       variant: variant ?? this.variant,
@@ -337,6 +369,8 @@ class YaruThemeData with Diagnosticable {
       pageTransitionsTheme: pageTransitionsTheme ?? this.pageTransitionsTheme,
       useMaterial3: useMaterial3 ?? this.useMaterial3,
       visualDensity: visualDensity ?? this.visualDensity,
+      customTitleButtonLayout:
+          customTitleButtonLayout ?? this.customTitleButtonLayout,
     );
   }
 
@@ -351,6 +385,9 @@ class YaruThemeData with Diagnosticable {
         .add(DiagnosticsProperty('pageTransitionsTheme', pageTransitionsTheme));
     properties.add(DiagnosticsProperty('useMaterial3', useMaterial3));
     properties.add(DiagnosticsProperty('visualDensity', visualDensity));
+    properties.add(
+      DiagnosticsProperty('customTitleButtonLayout', customTitleButtonLayout),
+    );
   }
 
   @override
@@ -364,7 +401,8 @@ class YaruThemeData with Diagnosticable {
         iterableEquals(other.extensions, extensions) &&
         other.pageTransitionsTheme == pageTransitionsTheme &&
         other.useMaterial3 == useMaterial3 &&
-        other.visualDensity == visualDensity;
+        other.visualDensity == visualDensity &&
+        other.customTitleButtonLayout == customTitleButtonLayout;
   }
 
   @override
@@ -377,6 +415,7 @@ class YaruThemeData with Diagnosticable {
       pageTransitionsTheme,
       useMaterial3,
       visualDensity,
+      customTitleButtonLayout,
     );
   }
 }

lib/src/settings/yaru_settings.dart

@@ -11,8 +11,10 @@ abstract class YaruSettings {
 
   String? getThemeName();
   String? getAccentColor();
+  String? getButtonLayout();
   Stream<String?> get themeNameChanged;
   Stream<String?> get accentColorChanged;
+  Stream<String?> get buttonLayoutChanged;
   void init();
   Future<void> dispose();
 }
@@ -27,7 +29,8 @@ class YaruGtkSettings extends YaruSettings {
 
   final GtkSettings _gtkSettings;
   final GSettingsService _gSettingsService;
-  GnomeSettings? _gSettings;
+  GnomeSettings? _interfaceSettings;
+  GnomeSettings? _wmPrefSettings;
 
   @override
   String? getThemeName() => _gtkSettings.getProperty(kGtkThemeName) as String?;
@@ -40,20 +43,32 @@ class YaruGtkSettings extends YaruSettings {
   @override
   Stream<String?> get accentColorChanged => _accentColorController.stream;
 
+  final _buttonLayoutController = StreamController<String?>.broadcast();
+  @override
+  Stream<String?> get buttonLayoutChanged => _buttonLayoutController.stream;
+
   @override
   void init() {
-    _gSettings ??= _gSettingsService.lookup(kSchemaInterface);
-    _gSettings?.addListener(
+    _interfaceSettings ??= _gSettingsService.lookup(kSchemaInterface);
+    _interfaceSettings?.addListener(
       () => _accentColorController.add(getAccentColor()),
     );
+    _wmPrefSettings ??= _gSettingsService.lookup(kSchemeWmPreferences);
+    _wmPrefSettings?.addListener(
+      () => _buttonLayoutController.add(getButtonLayout()),
+    );
   }
 
   @override
   Future<void> dispose() async {
     await _accentColorController.close();
+    await _buttonLayoutController.close();
     await _gSettingsService.dispose();
   }
 
   @override
-  String? getAccentColor() => _gSettings?.stringValue(kAccentColorKey);
+  String? getAccentColor() => _interfaceSettings?.stringValue(kAccentColorKey);
+
+  @override
+  String? getButtonLayout() => _wmPrefSettings?.stringValue(kButtonLayoutKey);
 }