Skip to content
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

Jump to bottom

feat: apply theming updates & enable xwayland scaling #1813

Merged
merged 4 commits into from
Oct 24, 2024
+17 −14
Merged

feat: apply theming updates & enable xwayland scaling #1813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3062c6
feat: apply theming updates
p5 Oct 20, 2024
fdfceb0
Merge branch 'main' into theme-changes
m2Giles Oct 23, 2024
aace503
chore: comment on dconf validation script
p5 Oct 24, 2024
a8bf9f8
Merge branch 'main' into theme-changes
p5 Oct 24, 2024
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
6 changes: 4 additions & 2 deletions build_files/bluefin-changes.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ if [[ "${BASE_IMAGE_NAME}" = "silverblue" ]]; then
find /usr/share/glib-2.0/schemas/ -type f ! -name "*.gschema.override" -exec cp {} /tmp/bluefin-schema-test/ \;
cp /usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override /tmp/bluefin-schema-test/
echo "Running error test for bluefin gschema override. Aborting if failed."
glib-compile-schemas --strict /tmp/bluefin-schema-test
# We are omitting "--strict" from the schema validation since GNOME <47 do not contain the accent-color keys.
# We should ideally refactor this to handle multiple GNOME version schemas better
glib-compile-schemas /tmp/bluefin-schema-test
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is the difference with having --strict removed?

Copy link
Member Author

@p5 p5 Oct 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

--strict is causing issues in GNOME <47 since the accent color dconf key doesn't exist in these lower versions. The flag causes any errors in the dconf to fail, whereas without it, those problematic keys are just excluded from the compiled data.

Copy link
Collaborator

@fiftydinar fiftydinar Oct 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you omit --strict from here, you destroy the purpose of running this test.

But it's a good point that this gschema test should handle lower Gnome versions better.

So maybe this can be temporarily removed, then put back when this logic gets revamped to support gschema checking for both :gts & :latest? Would be good to comment that here.

echo "Compiling gschema to include bluefin setting overrides"
glib-compile-schemas /usr/share/glib-2.0/schemas &>/dev/null
fi
fi
6 changes: 3 additions & 3 deletions packages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"ifuse",
"input-leap",
"input-remapper",
"jetbrains-mono-fonts-all",
"libimobiledevice",
"libxcrypt-compat",
"libsss_autofs",
Expand Down Expand Up @@ -122,7 +123,6 @@
"incus",
"incus-agent",
"iotop",
"jetbrains-mono-fonts-all",
"kcli",
"libvirt",
"libvirt-nss",
Expand Down Expand Up @@ -214,7 +214,7 @@
]
},
"exclude": {
"all": [],
"all": [],
"silverblue": [],
"kinoite": [],
"dx": []
Expand All @@ -229,7 +229,7 @@
"silverblue": []
},
"exclude": {
"all": [],
"all": [],
"silverblue": [],
"kinoite": [
"plasma-welcome",
Expand Down
19 changes: 10 additions & 9 deletions ...em_files/silverblue/usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ tap-to-click=true
[org.gnome.desktop.peripherals.touchpad]
tap-to-click=true

[org.gnome.shell]
[org.gnome.shell]
favorite-apps = ['org.mozilla.firefox.desktop', 'org.mozilla.Thunderbird.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Rhythmbox3.desktop', 'org.libreoffice.LibreOffice.writer.desktop', 'org.gnome.Software.desktop', 'code.desktop', 'ubuntu.desktop', 'yelp.desktop']
enabled-extensions = ['[email protected]', '[email protected]', 'blur-my-shell@aunetx', '[email protected]', 'logomenu@aryan_k', '[email protected]', '[email protected]']

Expand All @@ -24,13 +24,11 @@ secondary-color='FFFFFF'
[org.gnome.desktop.interface]
enable-hot-corners=false
clock-show-weekday=true
cursor-theme="Yaru"
icon-theme="Yaru-blue"
gtk-theme="Yaru-blue"
font-antialiasing="rgba"
font-name="Ubuntu 12"
document-font-name="Ubuntu 12"
monospace-font-name="Ubuntu Mono 18"
font-name="Inter 12"
document-font-name="Inter 12"
monospace-font-name="JetBrains Mono 18"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we still use size 18 font by default?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left it at 18 since it was like that before. I'm not opposed to changing this if we feel it's better suited.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that I picked that based on my own aging eyeballs, we should pick whatever the best default should be.

accent-color="slate"

[org.gnome.desktop.sound]
allow-volume-above-100-percent=true
Expand All @@ -39,7 +37,7 @@ theme-name="freedesktop"
[org.gnome.desktop.wm.preferences]
button-layout=":minimize,maximize,close"
num-workspaces=4
titlebar-font="Ubuntu Bold 12"
titlebar-font="Inter Bold 12"

[org.gnome.desktop.wm.keybindings]
switch-applications=['<Super>Tab']
Expand Down Expand Up @@ -77,7 +75,7 @@ sort-directories-first=true
sort-directories-first=true

[org.gnome.mutter]
experimental-features=['scale-monitor-framebuffer']
experimental-features=['scale-monitor-framebuffer', 'xwayland-native-scaling']
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this value cause an issue on Gnome 40?

Copy link
Member Author

@p5 p5 Oct 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not that I could tell. It just sits unused in versions <47

check-alive-timeout=uint32 20000

[org.gnome.software]
Expand Down Expand Up @@ -114,6 +112,9 @@ border-radius=1.65
border-color=(0.23, 0.23, 0.23, 1.0)
background-color=(0.0, 0.0, 0.0, 0.8)

[org.gnome.shell.extensions.blur-my-shell.dash-to-dock]
blur=true

#-------------- REMAINING SCHEMAS IN THIS SETTING SECTION ARE LOCATED IN DCONF --------------#
# Settings bellow are supported with gschema override, but other settings, which are relocatable schemas, are not. Edit dconfs if you need to modify relocatable schemas.

Expand Down
Loading