feat: hide client icon when collpased option and set window gravity (#88)

Reviewed-on: https://codeberg.org/GeopJr/Turntable/pulls/88

Author: GeopJr

data/dev.geopjr.Turntable.gschema.xml

@@ -60,6 +60,9 @@
 		<key name="now-playing" type="b">
 			<default>false</default>
 		</key>
+		<key name="hide-client-icon-collapsed" type="b">
+			<default>true</default>
+		</key>
 		<key name="component-more-controls" type="b">
 			<default>false</default>
 		</key>

meson.build

@@ -79,19 +79,24 @@ scrobbling = false
 libsoup_dep = dependency('libsoup-3.0', required: false)
 json_glib_dep = dependency('json-glib-1.0', version: '>=1.4.4', required: false)
 libsecret_dep = dependency('libsecret-1', required: false)
+gtk_dep = dependency('gtk4', version: '>=4.18.0', required: true)
 
 if get_option('scrobbling') and libsoup_dep.found () and json_glib_dep.found () and libsecret_dep.found ()
   scrobbling = true
   add_project_arguments(['--define=SCROBBLING'], language: 'vala')
 endif
 
+if gtk_dep.version().version_compare('>=4.20.0')
+  add_project_arguments(['--define=GTK_4_20'], language: 'vala')
+endif
+
 sources = files()
 subdir('src')
 
 final_deps = [
   dependency('glib-2.0', version: '>=2.76.0'),
-  dependency('gtk4', version: '>=4.13.4', required: true),
-  dependency('libadwaita-1', version: '>=1.5', required: true),
+  gtk_dep,
+  dependency('libadwaita-1', version: '>=1.7', required: true),
   dependency('gio-unix-2.0', required: true),
   dependency('glycin-2', required: true),
   dependency('glycin-gtk4-2', required: true),

src/Utils/Settings.vala

@@ -14,6 +14,7 @@ public class Turntable.Utils.Settings : GLib.Settings {
 	public bool now_playing { get; set; }
 	public bool offline_scrobbling { get; set; }
 	public bool collapsed_controls { get; set; }
+	public bool hide_client_icon_collapsed { get; set; }
 	public string cover_size { get; set; }
 	public string text_size { get; set; }
 	public string cover_scaling { get; set; }
@@ -37,6 +38,7 @@ public class Turntable.Utils.Settings : GLib.Settings {
 		"component-tonearm",
 		"component-center-text",
 		"now-playing",
+		"hide-client-icon-collapsed",
 		"component-more-controls",
 		"offline-scrobbling",
 		"collapsed-controls",

src/Views/Window.vala

@@ -4,6 +4,7 @@ public class Turntable.Views.Window : Adw.ApplicationWindow {
 	GLib.SimpleAction progressscale_style_action;
 	GLib.SimpleAction component_progressbin_action;
 	GLib.SimpleAction component_extract_colors_action;
+	GLib.SimpleAction hide_client_icon_collapsed_action;
 	GLib.SimpleAction window_style_action;
 	GLib.SimpleAction client_icon_style_action;
 	GLib.SimpleAction component_cover_fit_action;
@@ -29,10 +30,15 @@ public class Turntable.Views.Window : Adw.ApplicationWindow {
 				} else {
 					controls_overlay.remove_css_class ("collapsed");
 				}
+				update_client_icon_revealed ();
 			}
 		}
 	}
 
+	private void update_client_icon_revealed () {
+		this.prog.client_icon_revealed = !settings.hide_client_icon_collapsed || !this.collapsed;
+	}
+
 	~Window () {
 		update_player (null);
 		debug ("Destroying: %s", uuid);
@@ -419,6 +425,12 @@ public class Turntable.Views.Window : Adw.ApplicationWindow {
 		this.icon_name = Build.DOMAIN;
 		this.title = Build.NAME;
 
+		#if GTK_4_20
+			// Somehow this worked for a bit but then
+			// vala realized this is not in the vapi?
+			//  this.gravity = Gtk.WindowGravity.CENTER;
+			this.set_property ("gravity", 4);
+		#endif
 		setup_window_size ();
 		this.height_request = -1;
 		this.width_request = -1;
@@ -524,6 +536,10 @@ public class Turntable.Views.Window : Adw.ApplicationWindow {
 		component_extract_colors_action.change_state.connect (on_change_component_extract_colors);
 		this.add_action (component_extract_colors_action);
 
+		hide_client_icon_collapsed_action = new GLib.SimpleAction.stateful ("hide-client-icon-collapsed", null, settings.hide_client_icon_collapsed);
+		hide_client_icon_collapsed_action.change_state.connect (on_change_hide_client_icon_collapsed);
+		this.add_action (hide_client_icon_collapsed_action);
+
 		meta_dim_action = new GLib.SimpleAction.stateful ("meta-dim", null, settings.meta_dim);
 		meta_dim_action.change_state.connect (on_change_meta_dim);
 		this.add_action (meta_dim_action);
@@ -571,6 +587,7 @@ public class Turntable.Views.Window : Adw.ApplicationWindow {
 		settings.notify["orientation-horizontal"].connect (update_orientation_from_settings);
 		settings.notify["component-progressbin"].connect (update_progressbin_from_settings);
 		settings.notify["component-extract-colors"].connect (update_extract_colors_from_settings);
+		settings.notify["hide-client-icon-collapsed"].connect (update_hide_client_icon_collapsed_from_settings);
 		settings.notify["window-style"].connect (update_window_from_settings);
 		settings.notify["client-icon-style"].connect (update_client_icon_style_from_settings);
 		settings.notify["component-tonearm"].connect (update_component_tonearm_from_settings);
@@ -671,6 +688,7 @@ public class Turntable.Views.Window : Adw.ApplicationWindow {
 		update_progressscale_from_settings ();
 		update_progressbin_from_settings ();
 		update_extract_colors_from_settings ();
+		update_hide_client_icon_collapsed_from_settings ();
 		update_window_from_settings ();
 		update_client_icon_style_from_settings ();
 		update_component_tonearm_from_settings ();
@@ -737,6 +755,11 @@ public class Turntable.Views.Window : Adw.ApplicationWindow {
 		component_extract_colors_action.set_state (this.prog.extract_colors_enabled);
 	}
 
+	private void update_hide_client_icon_collapsed_from_settings () {
+		update_client_icon_revealed ();
+		hide_client_icon_collapsed_action.set_state (settings.hide_client_icon_collapsed);
+	}
+
 	private void update_orientation_from_settings () {
 		this.orientation = settings.orientation_horizontal ? Gtk.Orientation.HORIZONTAL : Gtk.Orientation.VERTICAL;
 		toggle_orientation_action.set_state (settings.orientation_horizontal);
@@ -926,6 +949,11 @@ public class Turntable.Views.Window : Adw.ApplicationWindow {
 		settings.component_extract_colors = value.get_boolean ();
 	}
 
+	private void on_change_hide_client_icon_collapsed (GLib.SimpleAction action, GLib.Variant? value) {
+		if (value == null) return;
+		settings.hide_client_icon_collapsed = value.get_boolean ();
+	}
+
 	private void on_change_window_style (GLib.SimpleAction action, GLib.Variant? value) {
 		if (value == null) return;
 		settings.window_style = value.get_string ();

src/Widgets/ControlsOverlay.vala

@@ -145,6 +145,8 @@ public class Turntable.Widgets.ControlsOverlay : Adw.Bin {
 		component_submenu_model.append (_("Fit Art on Cover"), "win.component-cover-fit");
 		// translators: whether to extract the colors of the cover and use them in UI elements (like Amberol or Material You)
 		component_submenu_model.append (_("Extract Cover Colors"), "win.component-extract-colors");
+		// translators: whether to hide the client icon when the controls are collapsed
+		component_submenu_model.append (_("Hide Client Icon when Collapsed"), "win.hide-client-icon-collapsed");
 		// translators: whether to show the shuffle and loop buttons
 		component_submenu_model.append (_("More Player Controls"), "win.component-more-controls");
 		// translators: whether to show a turntable tonearm in turntable styled cover art; tonearm is the 'arm' part of the turntable,

src/Widgets/ProgressBin.vala

@@ -4,6 +4,7 @@ public class Turntable.Widgets.ProgressBin : Adw.Bin {
 	Adw.TimedAnimation animation;
 	Gtk.Overlay overlay;
 	Gtk.Image client_icon_widget;
+	Adw.TimedAnimation client_icon_animation;
 
 	~ProgressBin () {
 		debug ("Destroying");
@@ -58,6 +59,19 @@ public class Turntable.Widgets.ProgressBin : Adw.Bin {
 		_client_icon = client_icon_widget.icon_name = name;
 	}
 
+	private bool _client_icon_revealed = true;
+	public bool client_icon_revealed {
+		get { return _client_icon_revealed; }
+		set {
+			if (value != _client_icon_revealed) {
+				_client_icon_revealed = value;
+				client_icon_animation.value_from = client_icon_animation.value;
+				client_icon_animation.value_to = value ? 1 : 0;
+				client_icon_animation.play ();
+			}
+		}
+	}
+
 	public Gtk.Widget content {
 		set {
 			overlay.child = value;
@@ -229,6 +243,10 @@ public class Turntable.Widgets.ProgressBin : Adw.Bin {
 			can_target = false
 		};
 
+		client_icon_animation = new Adw.TimedAnimation (this, 0.0, 1.0, 250, new Adw.PropertyAnimationTarget (client_icon_widget, "opacity")) {
+			easing = Adw.Easing.LINEAR
+		};
+
 		overlay.add_overlay (client_icon_widget);
 		this.child = overlay;
 	}