Index: gnome-shell-3.25.91/js/js-resources.gresource.xml =================================================================== --- gnome-shell-3.25.91.orig/js/js-resources.gresource.xml +++ gnome-shell-3.25.91/js/js-resources.gresource.xml @@ -111,6 +111,7 @@ ui/workspaceThumbnail.js ui/workspacesView.js ui/xdndHandler.js + ui/SLEClassicExt.js ui/components/__init__.js ui/components/autorunManager.js Index: gnome-shell-3.25.91/js/ui/layout.js =================================================================== --- gnome-shell-3.25.91.orig/js/ui/layout.js +++ gnome-shell-3.25.91/js/ui/layout.js @@ -25,6 +25,8 @@ var BACKGROUND_FADE_ANIMATION_TIME = 1.0 var HOT_CORNER_PRESSURE_THRESHOLD = 100; // pixels var HOT_CORNER_PRESSURE_TIMEOUT = 1000; // ms +const SLEClassicExt = imports.ui.SLEClassicExt; + function isPopupMetaWindow(actor) { switch(actor.meta_window.get_window_type()) { case Meta.WindowType.DROPDOWN_MENU: @@ -458,7 +460,7 @@ var LayoutManager = new Lang.Class({ this.screenShieldGroup.set_position(0, 0); this.screenShieldGroup.set_size(global.screen_width, global.screen_height); - this.panelBox.set_position(this.primaryMonitor.x, this.primaryMonitor.y); + SLEClassicExt.setMainPanelPosition(this.panelBox, this.primaryMonitor); this.panelBox.set_size(this.primaryMonitor.width, -1); this.keyboardIndex = this.primaryIndex; Index: gnome-shell-3.25.91/js/ui/main.js =================================================================== --- gnome-shell-3.25.91.orig/js/ui/main.js +++ gnome-shell-3.25.91/js/ui/main.js @@ -45,6 +45,8 @@ const Magnifier = imports.ui.magnifier; const XdndHandler = imports.ui.xdndHandler; const Util = imports.misc.util; +const SLEClassicExt = imports.ui.SLEClassicExt; + const A11Y_SCHEMA = 'org.gnome.desktop.a11y.keyboard'; const STICKY_KEYS_ENABLE = 'stickykeys-enable'; const GNOMESHELL_STARTED_MESSAGE_ID = 'f3ea493c22934e26811cd62abe8e203a'; @@ -130,6 +132,8 @@ function start() { shellMountOpDBusService = new ShellMountOperation.GnomeShellMountOpHandler(); _sessionUpdated(); + + SLEClassicExt.init(); } function _initializeUI() { Index: gnome-shell-3.25.91/js/ui/panel.js =================================================================== --- gnome-shell-3.25.91.orig/js/ui/panel.js +++ gnome-shell-3.25.91/js/ui/panel.js @@ -25,6 +25,8 @@ const RemoteMenu = imports.ui.remoteMenu const Main = imports.ui.main; const Tweener = imports.ui.tweener; +const SLEClassicExt = imports.ui.SLEClassicExt + var PANEL_ICON_SIZE = 16; var APP_MENU_ICON_MARGIN = 0; @@ -850,7 +852,9 @@ var Panel = new Lang.Class({ alloc.natural_size = -1; }, - _allocate: function(actor, box, flags) { + _allocate: SLEClassicExt._allocate, + + _allocateOrigin: function(actor, box, flags) { let allocWidth = box.x2 - box.x1; let allocHeight = box.y2 - box.y1; Index: gnome-shell-3.25.91/js/ui/sessionMode.js =================================================================== --- gnome-shell-3.25.91.orig/js/ui/sessionMode.js +++ gnome-shell-3.25.91/js/ui/sessionMode.js @@ -13,6 +13,8 @@ const Config = imports.misc.config; const DEFAULT_MODE = 'restrictive'; +const SLEClassicExt = imports.ui.SLEClassicExt; + const _modes = { 'restrictive': { parentMode: null, @@ -118,6 +120,7 @@ function _loadMode(file, info) { try { [success, fileContent, tag] = file.load_contents(null); newMode = JSON.parse(fileContent); + newMode = SLEClassicExt.convertClassic2SLE(newMode); } catch(e) { return; }