Accepting request 907577 from GNOME:Factory

- Drop gnome-shell-lock-bg-on-primary.patch: the
  gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch has been
  removed, we don't need this patch now(bsc#1188533). (forwarded request 907415 from xiaoguang_wang)

OBS-URL: https://build.opensuse.org/request/show/907577
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-shell?expand=0&rev=202
This commit is contained in:
Dominique Leuenberger 2021-07-22 20:43:07 +00:00 committed by Git OBS Bridge
commit 9103fbbce8
3 changed files with 7 additions and 44 deletions

View File

@ -1,41 +0,0 @@
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 104ff28..72959b3 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -68,7 +68,7 @@ var ScreenShield = class {
reactive: true,
can_focus: true,
pivot_point: new Graphene.Point({ x: 0.5, y: 0.5 }),
- name: 'lockDialogGroup',
+ name: 'lockDialogGroupReal'
});
// Add background for this._lockDialogGroup
@@ -84,6 +84,27 @@ var ScreenShield = class {
this.actor.add_actor(this._lockScreenGroup);
this.actor.add_actor(this._lockDialogGroup);
+ let primaryBackground = new St.Widget({ x_expand: true,
+ y_expand: true,
+ reactive: true,
+ pivot_point: new Clutter.Point({ x: 0.5, y: 0.5 }),
+ name: 'lockDialogGroup' });
+ primaryBackground.add_constraint(new Layout.MonitorConstraint({ primary: true }));
+ this.actor.insert_child_below(primaryBackground, null);
+
+ for (let i = 0; i < Main.layoutManager.monitors.length; i++) {
+ if (Main.layoutManager.monitors [i].index == Main.layoutManager.primaryMonitor.index)
+ continue;
+
+ let group = new St.Widget({ x_expand: true,
+ y_expand: true,
+ reactive: true,
+ pivot_point: new Clutter.Point({ x: 0.5, y: 0.5 }),
+ name: 'lockDialogGroup' });
+ group.add_constraint(new Layout.MonitorConstraint({ index: i }));
+ this.actor.insert_child_below(group, null);
+ }
+
this._presence = new GnomeSession.Presence((proxy, error) => {
if (error) {
logError(error, 'Error while reading gnome-session presence');

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jul 21 03:47:44 UTC 2021 - Xiaoguang Wang <xiaoguang.wang@suse.com>
- Drop gnome-shell-lock-bg-on-primary.patch: the
gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch has been
removed, we don't need this patch now(bsc#1188533).
-------------------------------------------------------------------
Tue Jul 13 10:55:55 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -52,8 +52,6 @@ Patch1002: gnome-shell-domain.patch
Patch1003: gnome-shell-screen-disappear.patch
# PATCH-FIX-SLE endSession-dialog-update-time-label-every-sec.patch bnc#886132 cxiong@suse.com -- update time label every second in end session dialog
Patch1004: endSession-dialog-update-time-label-every-sec.patch
# PATCH-FIX-SLE gnome-shell-lock-bg-on-primay.patch bnc#894050 dliang@suse.com -- display background of lock dialog on the primary screen.
Patch1006: gnome-shell-lock-bg-on-primary.patch
# PATCH-FIX-SLE gs-fate318433-prevent-same-account-multi-logins.patch fate#318433 cxiong@suse.com -- prevent multiple simultaneous login.
Patch1007: gs-fate318433-prevent-same-account-multi-logins.patch
@ -190,7 +188,6 @@ translation-update-upstream
%patch1002 -p1
%patch1003 -p1
%patch1004 -p1
%patch1006 -p1
%patch1007 -p1
%endif