Skip to content

feat(background): choose attribution quadrant #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
perlowja wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(background): choose attribution quadrant #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 69 additions & 18 deletions src/components/background/background.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,16 @@ namespace Singularity {
// but the manager owns that decision). Bottom-left, 40% width x
// 30% height, with a small margin from the very edge so the
// sample doesn't include the empty space around the label.
private const double CORNER_SAMPLE_X_FRAC = 0.0;
private const double CORNER_SAMPLE_Y_FRAC = 0.65;
// Sample rect fraction per quadrant, mirrored top<->bottom and
// left<->right from the original bottom-left values (x=0, y=0.65,
// w=0.40, h=0.30) so every quadrant samples the same fraction of
// wallpaper area the label actually sits over.
private const double CORNER_SAMPLE_W_FRAC = 0.40;
private const double CORNER_SAMPLE_H_FRAC = 0.30;
private const double CORNER_SAMPLE_X_LEFT = 0.0;
private const double CORNER_SAMPLE_X_RIGHT = 1.0 - CORNER_SAMPLE_W_FRAC;
private const double CORNER_SAMPLE_Y_TOP = 1.0 - 0.65 - CORNER_SAMPLE_H_FRAC;
private const double CORNER_SAMPLE_Y_BOTTOM = 0.65;
// Pixel margin from the screen edge to the attribution label.
// Bottom-left is clear of the dock (which is bottom-anchored
// and horizontally centered) at any reasonable screen width,
Expand Down Expand Up @@ -92,9 +98,10 @@ namespace Singularity {
wp_stack.add_named(picture_a, "a");
wp_stack.add_named(picture_b, "b");

// Attribution overlay. The label is bottom-left-anchored
// (halign=START, valign=END, ATTRIBUTION_MARGIN gutter)
// and click-through so it never intercepts desktop mouse
// Attribution overlay. The label sits in a user-selected
// screen quadrant (halign/valign driven by GSettings,
// ATTRIBUTION_MARGIN gutter) and click-through so it never
// intercepts desktop mouse
// events. can_target=false is GTK4's correct way to make a
// widget hit-test-transparent; setting can_focus=false
// prevents the label from grabbing Tab focus out of the
Expand All @@ -107,10 +114,6 @@ namespace Singularity {
// the contrast rule is consistent across panel + overlay.
attribution_label = new Label("");
attribution_label.add_css_class("attribution-label");
attribution_label.halign = Align.START;
attribution_label.valign = Align.END;
attribution_label.xalign = 0.0f;
attribution_label.yalign = 1.0f;
attribution_label.margin_start = ATTRIBUTION_MARGIN;
attribution_label.margin_end = ATTRIBUTION_MARGIN;
attribution_label.margin_bottom = ATTRIBUTION_MARGIN;
Expand All @@ -130,9 +133,14 @@ namespace Singularity {
// the toggle in Settings immediately hides or re-shows the
// overlay for the wallpaper that's currently displayed.
settings = new GLib.Settings("dev.sinty.desktop");
settings.changed["show-wallpaper-attribution"].connect(() => {
update_attribution(WallpaperManager.get_default());
settings.changed.connect((key) => {
if (key == "show-wallpaper-attribution") {
update_attribution(WallpaperManager.get_default());
} else if (key == "wallpaper-attribution-position") {
update_attribution_position();
}
});
update_attribution_position();
// First load: set both pictures to avoid flash, no animation needed
if (manager.display_texture != null) {
picture_a.set_paintable(manager.display_texture);
Expand Down Expand Up @@ -196,7 +204,7 @@ namespace Singularity {

// Wallpaper attribution overlay (Background.vala).
//
// Sits in the bottom-left corner of the live desktop background
// Sits in a user-selected screen quadrant of the live desktop background
// as a single Gtk.Label over the wallpaper cross-fade. The scrim
// is a semi-transparent rounded rectangle so the text reads
// against both bright and dark wallpapers without an aggressive
Expand Down Expand Up @@ -309,13 +317,19 @@ namespace Singularity {
attribution_label.set_markup(markup);
attribution_label.visible = true;

// Sample the corner. The pixbuf aspect matches the screen
// aspect so a fractional bottom-left corner maps 1:1 to a
// fractional bottom-left corner of the screen at the same
// proportional position.
// Sample the active quadrant. The pixbuf aspect matches the
// screen aspect so a fractional corner maps 1:1 to a fractional
// corner of the screen at the same proportional position --
// must track wallpaper-attribution-position or a right/top
// placed label reads contrast sampled from the opposite corner.
string sample_position = settings.get_string("wallpaper-attribution-position");
double sample_x = (sample_position == "top-right" || sample_position == "bottom-right")
? CORNER_SAMPLE_X_RIGHT : CORNER_SAMPLE_X_LEFT;
double sample_y = (sample_position == "top-left" || sample_position == "top-right")
? CORNER_SAMPLE_Y_TOP : CORNER_SAMPLE_Y_BOTTOM;
double lum = manager.corner_luminance_frac(
CORNER_SAMPLE_X_FRAC,
CORNER_SAMPLE_Y_FRAC,
sample_x,
sample_y,
CORNER_SAMPLE_W_FRAC,
CORNER_SAMPLE_H_FRAC);
if (lum >= 0.0) {
Expand All @@ -325,6 +339,43 @@ namespace Singularity {
}
}

// Valid values: "top-left", "top-right", "bottom-left" (default),
// "bottom-right" -- an unrecognized value safely falls back to
// bottom-left, matching this overlay's original fixed corner.
private void update_attribution_position() {
string position = settings.get_string("wallpaper-attribution-position");
switch (position) {
case "top-left":
attribution_label.halign = Align.START;
attribution_label.valign = Align.START;
attribution_label.xalign = 0.0f;
attribution_label.yalign = 0.0f;
break;
case "top-right":
attribution_label.halign = Align.END;
attribution_label.valign = Align.START;
attribution_label.xalign = 1.0f;
attribution_label.yalign = 0.0f;
break;
case "bottom-right":
attribution_label.halign = Align.END;
attribution_label.valign = Align.END;
attribution_label.xalign = 1.0f;
attribution_label.yalign = 1.0f;
break;
default:
attribution_label.halign = Align.START;
attribution_label.valign = Align.END;
attribution_label.xalign = 0.0f;
attribution_label.yalign = 1.0f;
break;
}
// Gtk.Overlay keeps its current child allocation when only the
// alignment changes, so explicitly request a fresh allocation
// for live GSettings changes to move the label immediately.
attribution_label.queue_allocate();
}

private void update_wallpaper(WallpaperManager manager) {
if (manager.display_texture == null) return;
// Write to the off-screen picture, then crossfade to it
Expand Down
18 changes: 18 additions & 0 deletions src/components/sidebar/pages/desktop_page.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,24 @@ namespace Singularity {
settings.set_boolean("show-wallpaper-attribution", attribution_row.switch_btn.active);
});

var attribution_position_options = new Gee.ArrayList<Singularity.Core.AppSettingOption>();
attribution_position_options.add(new Singularity.Core.AppSettingOption() { id = "top-left", label = _("Top Left") });
attribution_position_options.add(new Singularity.Core.AppSettingOption() { id = "top-right", label = _("Top Right") });
attribution_position_options.add(new Singularity.Core.AppSettingOption() { id = "bottom-left", label = _("Bottom Left") });
attribution_position_options.add(new Singularity.Core.AppSettingOption() { id = "bottom-right", label = _("Bottom Right") });
string attribution_position = settings.get_string("wallpaper-attribution-position");
bool valid_position = false;
foreach (var opt in attribution_position_options) {
if (opt.id == attribution_position) { valid_position = true; break; }
}
if (!valid_position) attribution_position = "bottom-left";
var attribution_position_row = new SelectionRow.with_options(
_("Wallpaper Info Position"), attribution_position_options, attribution_position);
attribution_position_row.selected.connect((id) => {
settings.set_string("wallpaper-attribution-position", id);
});
grid_group.add_row(attribution_position_row);

var interval_options = new Gee.ArrayList<Singularity.Core.AppSettingOption>();
interval_options.add(new Singularity.Core.AppSettingOption() { id = "600", label = _("Every 10 minutes") });
interval_options.add(new Singularity.Core.AppSettingOption() { id = "1800", label = _("Every 30 minutes") });
Expand Down
Loading