Accepting request 537511 from home:zhengqiang:branches:GNOME:Factory

- Update gse-sle-classic-ext.patch, make the bottom panel 
  background of SLE-Classic "black" in the Overview mode 
  (bsc#1064377).

OBS-URL: https://build.opensuse.org/request/show/537511
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell-extensions?expand=0&rev=147
This commit is contained in:
Dominique Leuenberger 2017-10-30 10:36:30 +00:00 committed by Git OBS Bridge
parent 2c22c2467c
commit f2b6886886
2 changed files with 48 additions and 24 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Oct 30 09:30:06 UTC 2017 - qzheng@suse.com
- Update gse-sle-classic-ext.patch, make the bottom panel
background of SLE-Classic "black" in the Overview mode
(bsc#1064377).
-------------------------------------------------------------------
Wed Oct 18 02:59:02 UTC 2017 - xwang@suse.com

View File

@ -1,7 +1,7 @@
Index: gnome-shell-extensions-3.26.1/data/gnome-classic.css
===================================================================
--- gnome-shell-extensions-3.26.1.orig/data/gnome-classic.css
+++ gnome-shell-extensions-3.26.1/data/gnome-classic.css
diff --git a/data/gnome-classic.css b/data/gnome-classic.css
index 5331df9..dcda0db 100644
--- a/data/gnome-classic.css
+++ b/data/gnome-classic.css
@@ -500,7 +500,12 @@ StScrollBar {
color: rgba(46, 52, 54, 0.5); }
.popup-menu.panel-menu {
@ -64,6 +64,24 @@ Index: gnome-shell-extensions-3.26.1/data/gnome-classic.css
border-top-color: #666;
/* we don't support non-uniform border-colors and
use the top border color for any border, so we
@@ -1892,12 +1892,12 @@ StScrollBar {
border-bottom: 1px solid #666;
app-icon-bottom-clip: 0px; }
#panel:overview {
- background-color: #000;
- background-gradient-end: #000;
- border-top-color: #000;
- border-bottom: 1px solid #000; }
+ background-color: #000 !important;
+ background-gradient-end: #000 !important;
+ border-top-color: #000 !important;
+ border-bottom: 1px solid #000 !important; }
#panel:overview .panel-button {
- color: #fff; }
+ color: #fff !important; }
#panel .panel-button {
-natural-hpadding: 8px;
-minimum-hpadding: 4px;
@@ -1912,8 +1912,6 @@ StScrollBar {
icon-shadow: none; }
#panel .panel-button:hover {
@ -88,10 +106,10 @@ Index: gnome-shell-extensions-3.26.1/data/gnome-classic.css
#panel .popup-menu-arrow {
width: 0;
height: 0; }
Index: gnome-shell-extensions-3.26.1/extensions/window-list/classic.css
===================================================================
--- gnome-shell-extensions-3.26.1.orig/extensions/window-list/classic.css
+++ gnome-shell-extensions-3.26.1/extensions/window-list/classic.css
diff --git a/extensions/window-list/classic.css b/extensions/window-list/classic.css
index f3c44a3..8096d27 100644
--- a/extensions/window-list/classic.css
+++ b/extensions/window-list/classic.css
@@ -6,7 +6,7 @@
height: 2.25em ;
}
@ -133,10 +151,10 @@ Index: gnome-shell-extensions-3.26.1/extensions/window-list/classic.css
color: #888;
box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5);
}
Index: gnome-shell-extensions-3.26.1/extensions/window-list/extension.js
===================================================================
--- gnome-shell-extensions-3.26.1.orig/extensions/window-list/extension.js
+++ gnome-shell-extensions-3.26.1/extensions/window-list/extension.js
diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js
index f01b872..6bd8709 100644
--- a/extensions/window-list/extension.js
+++ b/extensions/window-list/extension.js
@@ -22,6 +22,8 @@ const _ = Gettext.gettext;
const ICON_TEXTURE_SIZE = 24;
const DND_ACTIVATE_TIMEOUT = 500;
@ -156,7 +174,7 @@ Index: gnome-shell-extensions-3.26.1/extensions/window-list/extension.js
const WindowContextMenu = new Lang.Class({
Name: 'WindowContextMenu',
Extends: PopupMenu.PopupMenu,
@@ -113,6 +118,9 @@ const WindowContextMenu = new Lang.Class
@@ -113,6 +118,9 @@ const WindowContextMenu = new Lang.Class({
}));
this.addMenuItem(this._closeItem);
@ -166,7 +184,7 @@ Index: gnome-shell-extensions-3.26.1/extensions/window-list/extension.js
this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
this.connect('open-state-changed', () => {
@@ -678,6 +686,8 @@ const WorkspaceIndicator = new Lang.Clas
@@ -678,6 +686,8 @@ const WorkspaceIndicator = new Lang.Class({
this.parent(0.0, _("Workspace Indicator"), true);
this.setMenu(new PopupMenu.PopupMenu(this.actor, 0.0, St.Side.BOTTOM));
this.actor.add_style_class_name('window-list-workspace-indicator');
@ -175,18 +193,17 @@ Index: gnome-shell-extensions-3.26.1/extensions/window-list/extension.js
this.menu.actor.remove_style_class_name('panel-menu');
let container = new St.Widget({ layout_manager: new Clutter.BinLayout(),
@@ -782,88 +792,52 @@ const WorkspaceIndicator = new Lang.Clas
@@ -782,88 +792,52 @@ const WorkspaceIndicator = new Lang.Class({
}
});
-const WindowList = new Lang.Class({
- Name: 'WindowList',
-
- _init: function(perMonitor, monitor) {
+// NOTE: call `initializeWindowList` explicitly to finish initialization.
+const PureWinList = new Lang.Class({
+ Name: 'PureWinList',
+
- _init: function(perMonitor, monitor) {
+ _init: function(perMonitor, monitor, maxWidthFunc) {
+ // NOTE: in SLE Classic `PureWinList` will NOT use any multiple monitor
+ // support, the following is kept for use in GNOME Classic as we try to
@ -286,14 +303,14 @@ Index: gnome-shell-extensions-3.26.1/extensions/window-list/extension.js
- this._updateKeyboardAnchor();
- }));
+ this._settings = Convenience.getSettings();
+
+ // Grouping
+ this._groupingModeChangedId =
+ this._settings.connect('changed::grouping-mode',
+ Lang.bind(this, this._groupingModeChanged));
+ this._grouped = undefined;
+ // NOTE: do NOT `_checkGrouping` here
+
+ // workspace related
this._workspaceSignals = new Map();
this._nWorkspacesChangedId =
@ -919,10 +936,10 @@ Index: gnome-shell-extensions-3.26.1/extensions/window-list/extension.js
+ return new Extension();
+ }
}
Index: gnome-shell-extensions-3.26.1/extensions/window-list/stylesheet.css
===================================================================
--- gnome-shell-extensions-3.26.1.orig/extensions/window-list/stylesheet.css
+++ gnome-shell-extensions-3.26.1/extensions/window-list/stylesheet.css
diff --git a/extensions/window-list/stylesheet.css b/extensions/window-list/stylesheet.css
index f5285cb..c207078 100644
--- a/extensions/window-list/stylesheet.css
+++ b/extensions/window-list/stylesheet.css
@@ -79,6 +79,10 @@
border: 1px solid #cccccc;
}