Skip to content

Make the wallpaper fit default actually apply, and fit rather than crop - #2

Open
wayne-tbl wants to merge 2 commits into
FuriLabs:forkyfrom
wayne-tbl:wallpaper
Open

wayne-tbl wants to merge 2 commits into
FuriLabs:forkyfrom
wayne-tbl:wallpaper

Conversation

@wayne-tbl

Copy link
Copy Markdown

Moves the wallpaper picture-options default here out of FuriLabs/phosh#5,
where it did not belong.

Two commits, because they are two separate things.

1. debian: scope the screensaver default to Phosh so it applies

The picture-options already in this file has never taken effect on
FuriOS.
phosh ships a desktop-scoped default of its own:

# 00_mobi.Phosh.gschema.override
[org.gnome.desktop.screensaver:Phosh]
picture-options='none'

and a desktop-scoped default beats a generic one whatever the filenames sort
like, so the plain [org.gnome.desktop.screensaver] section here is silently
ignored under Phosh.

Verified rather than inferred, by compiling 00_mobi.Phosh.gschema.override
and this file into a throwaway schema directory and reading the key back:

XDG_CURRENT_DESKTOP=Phosh  ->  'none'    # phosh wins
XDG_CURRENT_DESKTOP=GNOME  ->  'zoom'    # only here does ours apply

Scoping our section the same way lets file order decide, and 10_ sorts after
00_. This commit changes no value — it only makes the existing 'zoom'
actually reach the lock screen for the first time.

2. debian: default to fitting the whole picture

'zoom' covers the screen and crops whatever does not fit. That suits a
wallpaper chosen for the shape of the screen; it suits a phone badly, because
the pictures people actually use are photographs they took, and a 4:3
photograph on a 20:9 screen loses most of its width to a crop it has no say
over. 'scaled' keeps all of the picture.

Both keys, since the lock screen has a wallpaper of its own.

The two are split so the first can be taken and the second dropped if you
disagree about scaled — the bug fix does not depend on the value change.

picture-options here has never taken effect. phosh ships
00_mobi.Phosh.gschema.override with a desktop scoped

  [org.gnome.desktop.screensaver:Phosh]
  picture-options='none'

and a desktop scoped default beats a generic one whatever the filenames
sort like, so the plain [org.gnome.desktop.screensaver] section in this
file is silently ignored on FuriOS. Verified by compiling both override
files into a throwaway schema directory: under XDG_CURRENT_DESKTOP=Phosh
the key resolves to 'none', and only under GNOME to the 'zoom' set here.

Scoping the section the same way lets file order decide, and 10 sorts
after 00.

Signed-off-by: wayne <wayne@furilabs.com>
'zoom' covers the screen and crops whatever does not fit. That suits a
wallpaper chosen for the shape of the screen; it suits a phone badly,
because the pictures people actually use are photographs they took, and a
4:3 photograph on a 20:9 screen loses most of its width to a crop it has
no say over. 'scaled' keeps all of the picture.

Both keys, since the lock screen has a wallpaper of its own.

Signed-off-by: wayne <wayne@furilabs.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant