[gnome-shell/gbsneto/new-lock-screen-part2: 6/6] background: Remove noise texture
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/gbsneto/new-lock-screen-part2: 6/6] background: Remove noise texture
- Date: Wed, 5 Feb 2020 17:16:08 +0000 (UTC)
commit 3306325233c71b6768ff7e304cfb22ce768dd16e
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Wed Feb 5 11:21:30 2020 -0300
background: Remove noise texture
Use the plain background color.
Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/2174
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872
data/gnome-shell-theme.gresource.xml | 1 -
.../gnome-shell-sass/widgets/_screen-shield.scss | 3 +--
data/theme/noise-texture.png | Bin 79464 -> 0 bytes
js/ui/background.js | 24 +++++----------------
4 files changed, 6 insertions(+), 22 deletions(-)
---
diff --git a/data/gnome-shell-theme.gresource.xml b/data/gnome-shell-theme.gresource.xml
index cc9caef0a3..c846b9cef3 100644
--- a/data/gnome-shell-theme.gresource.xml
+++ b/data/gnome-shell-theme.gresource.xml
@@ -18,7 +18,6 @@
<file alias="icons/message-indicator-symbolic.svg">message-indicator-symbolic.svg</file>
<file>no-events.svg</file>
<file>no-notifications.svg</file>
- <file>noise-texture.png</file>
<file>pad-osd.css</file>
<file alias="icons/eye-open-negative-filled-symbolic.svg">eye-open-negative-filled-symbolic.svg</file>
<file alias="icons/eye-not-looking-symbolic.svg">eye-not-looking-symbolic.svg</file>
diff --git a/data/theme/gnome-shell-sass/widgets/_screen-shield.scss
b/data/theme/gnome-shell-sass/widgets/_screen-shield.scss
index 2c45589aca..6928be9fb5 100644
--- a/data/theme/gnome-shell-sass/widgets/_screen-shield.scss
+++ b/data/theme/gnome-shell-sass/widgets/_screen-shield.scss
@@ -55,8 +55,7 @@
}
#lockDialogGroup {
- background: lighten(#2e3436, 8%) url(resource:///org/gnome/shell/theme/noise-texture.png);
- background-repeat: repeat;
+ background-color: lighten(#2e3436, 8%);
}
#unlockDialogNotifications {
diff --git a/js/ui/background.js b/js/ui/background.js
index f7506dec4b..ddae0de873 100644
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -504,12 +504,9 @@ var SystemBackground = GObject.registerClass({
Signals: { 'loaded': {} },
}, class SystemBackground extends Meta.BackgroundActor {
_init() {
- let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/noise-texture.png');
-
if (_systemBackground == null) {
_systemBackground = new Meta.Background({ meta_display: global.display });
_systemBackground.set_color(DEFAULT_BACKGROUND_COLOR);
- _systemBackground.set_file(file, GDesktopEnums.BackgroundStyle.WALLPAPER);
}
super._init({
@@ -518,22 +515,11 @@ var SystemBackground = GObject.registerClass({
background: _systemBackground,
});
- let cache = Meta.BackgroundImageCache.get_default();
- let image = cache.load(file);
- if (image.is_loaded()) {
- image = null;
- let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
- this.emit('loaded');
- return GLib.SOURCE_REMOVE;
- });
- GLib.Source.set_name_by_id(id, '[gnome-shell] SystemBackground.loaded');
- } else {
- let id = image.connect('loaded', () => {
- this.emit('loaded');
- image.disconnect(id);
- image = null;
- });
- }
+ let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
+ this.emit('loaded');
+ return GLib.SOURCE_REMOVE;
+ });
+ GLib.Source.set_name_by_id(id, '[gnome-shell] SystemBackground.loaded');
}
});
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]