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
1diff --git a/debian/changelog b/debian/changelog
2index 0934982..c208428 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+gnome-shell (3.31.90-1ubuntu2) UNRELEASED; urgency=medium
7+
8+ * Update ubuntu/background_login.patch to match the new login screen
9+ (system background) design from Yaru for a smooth login animation
10+ (LP: #1813119).
11+
12+ -- Daniel van Vugt <daniel.van.vugt@canonical.com> Fri, 01 Mar 2019 16:09:30 +0800
13+
14 gnome-shell (3.31.90-1ubuntu1) disco; urgency=medium
15
16 [ Marco Trevisan (TreviƱo) ]
17diff --git a/debian/patches/ubuntu/background_login.patch b/debian/patches/ubuntu/background_login.patch
18index 6f85511..4f509b8 100644
19--- a/debian/patches/ubuntu/background_login.patch
20+++ b/debian/patches/ubuntu/background_login.patch
21@@ -1,21 +1,17 @@
22-From: Didier Roche <didrocks@ubuntu.com>
23-Date: Wed, 20 Jun 2018 19:22:06 +0200
24-Subject: Change default background color based on session.
25-
26-We changed default GDM color for our ubuntu session. Change it as well here
27-to match Yaru GDM background.
28-This screen is appearing for a slip second when the Shell is loading.
29+Description: js/ui/background.js: Use Ubuntu purple to match login screen
30+ This way the login animation will appear to expand over the login
31+ screen (system background) instead of suddenly replacing it.
32+Original author: Didier Roche <didrocks@ubuntu.com>
33+Author: Daniel van Vugt <daniel.van.vugt@canonical.com>
34+Bug-Ubuntu: https://launchpad.net/bugs/1813119
35+Last-Update: 2019-03-01
36 Forwarded: not-needed
37-===================================================================
38----
39- js/ui/background.js | 21 +++++++++++++++++++++
40- 1 file changed, 21 insertions(+)
41
42-diff --git a/js/ui/background.js b/js/ui/background.js
43-index 874bda3..0a4e9ad 100644
44---- a/js/ui/background.js
45-+++ b/js/ui/background.js
46-@@ -101,6 +101,7 @@ const GnomeDesktop = imports.gi.GnomeDesktop;
47+Index: gnome-shell/js/ui/background.js
48+===================================================================
49+--- gnome-shell.orig/js/ui/background.js
50++++ gnome-shell/js/ui/background.js
51+@@ -101,6 +101,7 @@ const GnomeDesktop = imports.gi.GnomeDes
52 const Meta = imports.gi.Meta;
53 const Signals = imports.signals;
54
55@@ -23,7 +19,7 @@ index 874bda3..0a4e9ad 100644
56 const LoginManager = imports.misc.loginManager;
57 const Main = imports.ui.main;
58 const Params = imports.misc.params;
59-@@ -489,6 +490,26 @@ let _systemBackground;
60+@@ -489,6 +490,25 @@ let _systemBackground;
61
62 var SystemBackground = class SystemBackground {
63 constructor() {
64@@ -31,9 +27,8 @@ index 874bda3..0a4e9ad 100644
65 + if (Desktop.is("ubuntu")) {
66 + if (_systemBackground == null) {
67 + _systemBackground = new Meta.Background({ meta_display: global.display });
68-+ let [, topColor] = Clutter.Color.from_string('#6D2169');
69-+ let [, bottomColor] = Clutter.Color.from_string('#370026');
70-+ _systemBackground.set_gradient(GDesktopEnums.BackgroundShading.VERTICAL, topColor, bottomColor);
71++ let [, ubuntuColor] = Clutter.Color.from_string('#2C001E');
72++ _systemBackground.set_color(ubuntuColor);
73 + }
74 + this.actor = new Meta.BackgroundActor({ meta_display: global.display,
75 + monitor: 0,

Subscribers

People subscribed via source and target branches