Merge ~vanvugt/ubuntu/+source/gnome-shell:fix-lp1813119-disco into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master

Proposed by Daniel van Vugt on 2019-03-01
Status: Merged
Merged at revision: c14508e8bffd496e568dbf9c97b547fccbb4cea6
Proposed branch: ~vanvugt/ubuntu/+source/gnome-shell:fix-lp1813119-disco
Merge into: ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Diff against target: 75 lines (+23/-20)
2 files modified
debian/changelog (+8/-0)
debian/patches/ubuntu/background_login.patch (+15/-20)
Reviewer Review Type Date Requested Status
Didier Roche 2019-03-01 Approve on 2019-03-04
Review via email: mp+363831@code.launchpad.net

Commit message

Update ubuntu/background_login.patch to match disco theme

Fixes LP: #1813119

To post a comment you must log in.
Didier Roche (didrocks) wrote :

LGTM and color matches new Yaru theme in GDM.
+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index 0934982..c208428 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
1gnome-shell (3.31.90-1ubuntu2) UNRELEASED; urgency=medium
2
3 * Update ubuntu/background_login.patch to match the new login screen
4 (system background) design from Yaru for a smooth login animation
5 (LP: #1813119).
6
7 -- Daniel van Vugt <daniel.van.vugt@canonical.com> Fri, 01 Mar 2019 16:09:30 +0800
8
1gnome-shell (3.31.90-1ubuntu1) disco; urgency=medium9gnome-shell (3.31.90-1ubuntu1) disco; urgency=medium
210
3 [ Marco Trevisan (Treviño) ]11 [ Marco Trevisan (Treviño) ]
diff --git a/debian/patches/ubuntu/background_login.patch b/debian/patches/ubuntu/background_login.patch
index 6f85511..4f509b8 100644
--- a/debian/patches/ubuntu/background_login.patch
+++ b/debian/patches/ubuntu/background_login.patch
@@ -1,21 +1,17 @@
1From: Didier Roche <didrocks@ubuntu.com>1Description: js/ui/background.js: Use Ubuntu purple to match login screen
2Date: Wed, 20 Jun 2018 19:22:06 +02002 This way the login animation will appear to expand over the login
3Subject: Change default background color based on session.3 screen (system background) instead of suddenly replacing it.
44Original author: Didier Roche <didrocks@ubuntu.com>
5We changed default GDM color for our ubuntu session. Change it as well here5Author: Daniel van Vugt <daniel.van.vugt@canonical.com>
6to match Yaru GDM background.6Bug-Ubuntu: https://launchpad.net/bugs/1813119
7This screen is appearing for a slip second when the Shell is loading.7Last-Update: 2019-03-01
8Forwarded: not-needed8Forwarded: not-needed
9===================================================================
10---
11 js/ui/background.js | 21 +++++++++++++++++++++
12 1 file changed, 21 insertions(+)
139
14diff --git a/js/ui/background.js b/js/ui/background.js10Index: gnome-shell/js/ui/background.js
15index 874bda3..0a4e9ad 10064411===================================================================
16--- a/js/ui/background.js12--- gnome-shell.orig/js/ui/background.js
17+++ b/js/ui/background.js13+++ gnome-shell/js/ui/background.js
18@@ -101,6 +101,7 @@ const GnomeDesktop = imports.gi.GnomeDesktop;14@@ -101,6 +101,7 @@ const GnomeDesktop = imports.gi.GnomeDes
19 const Meta = imports.gi.Meta;15 const Meta = imports.gi.Meta;
20 const Signals = imports.signals;16 const Signals = imports.signals;
21 17
@@ -23,7 +19,7 @@ index 874bda3..0a4e9ad 100644
23 const LoginManager = imports.misc.loginManager;19 const LoginManager = imports.misc.loginManager;
24 const Main = imports.ui.main;20 const Main = imports.ui.main;
25 const Params = imports.misc.params;21 const Params = imports.misc.params;
26@@ -489,6 +490,26 @@ let _systemBackground;22@@ -489,6 +490,25 @@ let _systemBackground;
27 23
28 var SystemBackground = class SystemBackground {24 var SystemBackground = class SystemBackground {
29 constructor() {25 constructor() {
@@ -31,9 +27,8 @@ index 874bda3..0a4e9ad 100644
31+ if (Desktop.is("ubuntu")) {27+ if (Desktop.is("ubuntu")) {
32+ if (_systemBackground == null) {28+ if (_systemBackground == null) {
33+ _systemBackground = new Meta.Background({ meta_display: global.display });29+ _systemBackground = new Meta.Background({ meta_display: global.display });
34+ let [, topColor] = Clutter.Color.from_string('#6D2169');30+ let [, ubuntuColor] = Clutter.Color.from_string('#2C001E');
35+ let [, bottomColor] = Clutter.Color.from_string('#370026');31+ _systemBackground.set_color(ubuntuColor);
36+ _systemBackground.set_gradient(GDesktopEnums.BackgroundShading.VERTICAL, topColor, bottomColor);
37+ }32+ }
38+ this.actor = new Meta.BackgroundActor({ meta_display: global.display,33+ this.actor = new Meta.BackgroundActor({ meta_display: global.display,
39+ monitor: 0,34+ monitor: 0,

Subscribers

People subscribed via source and target branches