Merge ~vanvugt/ubuntu/+source/gnome-shell:fix-eoan-purple-system-background into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master

Proposed by Daniel van Vugt on 2019-08-30
Status: Merged
Merged at revision: ab6dad7455a89f51b098aa76b0ea01487aff00ee
Proposed branch: ~vanvugt/ubuntu/+source/gnome-shell:fix-eoan-purple-system-background
Merge into: ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Diff against target: 73 lines (+17/-27)
1 file modified
debian/patches/ubuntu/background_login.patch (+17/-27)
Reviewer Review Type Date Requested Status
Iain Lane 2019-08-30 Approve on 2019-09-05
Didier Roche 2019-08-30 Pending
Review via email: mp+372051@code.launchpad.net

Commit message

background_login.patch: Match 19.10 Yaru purple login screen with noise.

This way the login animation will appear to expand over the login screen
(system background) instead of suddenly replacing it.

Description of the change

It would be so nice to automate matching of these two styles, but nobody has made the time yet.

P.S. The diff of the diff looks wrong but it's not. Try just reviewing the whole file:
https://git.launchpad.net/~vanvugt/ubuntu/+source/gnome-shell/tree/debian/patches/ubuntu/background_login.patch?h=fix-eoan-purple-system-background

To post a comment you must log in.
Iain Lane (laney) wrote :

thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/patches/ubuntu/background_login.patch b/debian/patches/ubuntu/background_login.patch
2index 98334d7..29bbceb 100644
3--- a/debian/patches/ubuntu/background_login.patch
4+++ b/debian/patches/ubuntu/background_login.patch
5@@ -1,27 +1,15 @@
6-From: Daniel van Vugt <daniel.van.vugt@canonical.com>
7-Date: Wed, 6 Mar 2019 14:48:10 +0000
8-Subject: js/ui/background.js: Use Ubuntu purple to match login screen
9-
10-Original author: Didier Roche <didrocks@ubuntu.com>
11-Bug-Ubuntu: https://launchpad.net/bugs/1813119
12-Last-Update: 2019-03-01
13-Forwarded: not-needed
14-
15-This way the login animation will appear to expand over the login
16-screen (system background) instead of suddenly replacing it.
17+Description: js/ui/background.js: Match 19.10 Yaru purple login screen with noise.
18+ This way the login animation will appear to expand over the login
19+ screen (system background) instead of suddenly replacing it.
20 Original author: Didier Roche <didrocks@ubuntu.com>
21 Author: Daniel van Vugt <daniel.van.vugt@canonical.com>
22-Bug-Ubuntu: https://launchpad.net/bugs/1813119
23-Last-Update: 2019-03-01
24+Last-Update: 2019-08-30
25 Forwarded: not-needed
26----
27- js/ui/background.js | 20 ++++++++++++++++++++
28- 1 file changed, 20 insertions(+)
29
30-diff --git a/js/ui/background.js b/js/ui/background.js
31-index babc1e4..ab1dba0 100644
32---- a/js/ui/background.js
33-+++ b/js/ui/background.js
34+Index: gnome-shell/js/ui/background.js
35+===================================================================
36+--- gnome-shell.orig/js/ui/background.js
37++++ gnome-shell/js/ui/background.js
38 @@ -96,6 +96,7 @@
39 const { Clutter, GDesktopEnums, Gio, GLib, GnomeDesktop, Meta } = imports.gi;
40 const Signals = imports.signals;
41@@ -30,16 +18,18 @@ index babc1e4..ab1dba0 100644
42 const LoginManager = imports.misc.loginManager;
43 const Main = imports.ui.main;
44 const Params = imports.misc.params;
45-@@ -499,6 +500,25 @@ let _systemBackground;
46-
47- var SystemBackground = class SystemBackground {
48+@@ -501,6 +502,27 @@ var SystemBackground = class SystemBackg
49 constructor() {
50+ let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/noise-texture.png');
51+
52 + // Yaru is default ubuntu theme, match GDM look
53 + if (Desktop.is("ubuntu")) {
54 + if (_systemBackground == null) {
55-+ _systemBackground = new Meta.Background({ meta_display: global.display });
56-+ let [, ubuntuColor] = Clutter.Color.from_string('#2C001E');
57++ _systemBackground = new Meta.Background({ meta_display: global.display })
58++ // Yaru uses darken(#762572, 10%) + noise for #lockDialogGroup
59++ let [, ubuntuColor] = Clutter.Color.from_string('#4f194c');
60 + _systemBackground.set_color(ubuntuColor);
61++ _systemBackground.set_file(file, GDesktopEnums.BackgroundStyle.WALLPAPER);
62 + }
63 + this.actor = new Meta.BackgroundActor({ meta_display: global.display,
64 + monitor: 0,
65@@ -53,6 +43,6 @@ index babc1e4..ab1dba0 100644
66 + return;
67 + }
68 +
69- let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/noise-texture.png');
70-
71 if (_systemBackground == null) {
72+ _systemBackground = new Meta.Background({ meta_display: global.display });
73+ _systemBackground.set_color(DEFAULT_BACKGROUND_COLOR);

Subscribers

People subscribed via source and target branches