Hello community,
here is the log from the commit of package gnome-shell-extensions for
openSUSE:Factory checked in at 2017-12-19 10:45:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-shell-extensions (Old)
and /work/SRC/openSUSE:Factory/.gnome-shell-extensions.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-shell-extensions"
Tue Dec 19 10:45:00 2017 rev:73 rq:556920 version:3.26.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/gnome-shell-extensions/gnome-shell-extensions.changes
2017-11-30 16:32:15.429330917 +0100
+++
/work/SRC/openSUSE:Factory/.gnome-shell-extensions.new/gnome-shell-extensions.changes
2017-12-19 10:45:02.736284139 +0100
@@ -1,0 +2,9 @@
+Thu Dec 14 01:29:21 UTC 2017 - [email protected]
+
+- Fix in SLE-Classic session application title bar doesn't show
+ application menu (bsc#1070090 bgo#746592).
+ + Update [email protected]
+ + Update sle-classic.desktop
+ + Update sle-classic-xorg.desktop
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sle-classic-xorg.desktop ++++++
--- /var/tmp/diff_new_pack.xZp79V/_old 2017-12-19 10:45:04.732187788 +0100
+++ /var/tmp/diff_new_pack.xZp79V/_new 2017-12-19 10:45:04.732187788 +0100
@@ -139,4 +139,4 @@
TryExec=gnome-session
Icon=
Type=Application
-DesktopNames=GNOME-Classic;GNOME
+DesktopNames=sle-classic;GNOME
++++++ sle-classic.desktop ++++++
--- /var/tmp/diff_new_pack.xZp79V/_old 2017-12-19 10:45:04.752186823 +0100
+++ /var/tmp/diff_new_pack.xZp79V/_new 2017-12-19 10:45:04.752186823 +0100
@@ -139,4 +139,4 @@
TryExec=gnome-session
Icon=
Type=Application
-DesktopNames=GNOME-Classic;GNOME
+DesktopNames=sle-classic;GNOME
++++++ [email protected] ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/[email protected]/extension.js
new/[email protected]/extension.js
--- old/[email protected]/extension.js 2017-11-03 07:05:03.231900388
+0100
+++ new/[email protected]/extension.js 2017-12-08 04:11:43.873463586
+0100
@@ -22,9 +22,9 @@
const WINDOW_CLONE_MAXIMUM_SCALE = 1.0;
-//simulate classic session
-//global-shell.c shell_global_get_overrides_settings
-//main.c shell_prefs_init
+// Simulate classic session
+// global-shell.c shell_global_get_overrides_settings
+// main.c shell_prefs_init
function initClassicOverridesSchema() {
let settings = new Gio.Settings({ schema_id: CLASSIC_OVERRIDES_SCHEMA});
let keys = settings.settings_schema.list_keys();
@@ -34,62 +34,6 @@
}
}
-// NOTE: used in `SLEClassicExt.init`
-//
-// NOTE: it's mandatory to disable app menu in SLE Classic but restore the old
-// settings after switching back. A more proper solution would be to introduce
a
-// dconf overrides key AND change the GSD part to read the overriden value. Too
-// much work, keep it a hack for now.
-function toggleAppMenu() {
- let xsetting = new Gio.Settings({ schema:
'org.gnome.settings-daemon.plugins.xsettings' });
- let valueObj = xsetting.get_value('overrides').unpack();
-
- // NOTE: as dictated by the definitions in gschema, the values for the
- // following flags can NOT be booleans, but instead 0 or 1.
-
- // NOTE: special handling, as if `Gtk/ShellShowsAppMenu` is NOT set, it's
- // treated as true by XSettings
- const showAppMenuKey = 'Gtk/ShellShowsAppMenu';
- const showAppMenuSLESetKey = 'Gtk/ShellShowsAppMenu/SLESet';
- // NOTE double `unpack` is needed as 'a{sv}' construction would wrap the
value
- // in an extra Variant container.
- let showAppMenuP = valueObj[showAppMenuKey]
- ? valueObj[showAppMenuKey].unpack().unpack()
- : 1;
- let showAppMenuSLESet = valueObj[showAppMenuSLESetKey]
- ? valueObj[showAppMenuSLESetKey].unpack().unpack()
- : 0;
-
- // NOTE extra check to make sure `showAppMenuP` and `showAppMenuSLESet` are
- // numbers. ('v' can be many other types and it's possible the user sets
so)
- // The fallback value is the same as above defaults.
- if (typeof showAppMenuP !== 'number') {
- showAppMenuP = 1;
- }
- if (typeof showAppMenuSLESet !== 'number') {
- showAppMenuSLESet = 0;
- }
-
- // NOTE: In SLE Classic mode, if app menu is set to shown, hide it and set
a
- // special flag to mark this change for restoring.
- if (showAppMenuP) {
- showAppMenuP = 0;
- showAppMenuSLESet = 1;
- }
-
- // NOTE: in none-SLE Classic mode, if app menu is hidden AND `SLESet` flag
- // is set, show the app menu and reset the `SLESet` flag.
- if (showAppMenuSLESet) {
- showAppMenuP = 1;
- showAppMenuSLESet = 0;
- }
-
- valueObj[showAppMenuKey] = GLib.Variant.new('i', showAppMenuP);
- valueObj[showAppMenuSLESetKey] = GLib.Variant.new('i', showAppMenuSLESet);
-
- xsetting.set_value('overrides', GLib.Variant.new('a{sv}', valueObj));
-}
-
// panel.js: Replace the original "Panel._allocate".
//
// The differences are quite subtle but yet pervasive, so despite the
@@ -208,7 +152,7 @@
// layout.js: Replace the origin "box.set_position" call
function setMainPanelPosition (mainPanel, primaryMonitor) {
- let mainPanelHeight = mainPanel.height == 0 ? 28 : mainPanel.height;
+ let mainPanelHeight = mainPanel.height === 0 ? 28 : mainPanel.height;
mainPanel.set_position(primaryMonitor.x,
primaryMonitor.y + primaryMonitor.height -
mainPanelHeight);
@@ -220,7 +164,7 @@
this.screenShieldGroup.set_size(global.screen_width, global.screen_height);
if (!this.primaryMonitor)
- return;
+ return;
setMainPanelPosition(this.panelBox, this.primaryMonitor);
this.panelBox.set_size(this.primaryMonitor.width, -1);
@@ -298,7 +242,7 @@
// keep track how much smaller the grid becomes due to scaling
// so it can be centered again
- let compensation = 0
+ let compensation = 0;
let y = 0;
for (let i = 0; i < rows.length; i++) {
@@ -320,7 +264,7 @@
// height would undo what vertical scaling is trying to achieve.
}
- row.x = area.x + (Math.max(area.width - (widthWithoutSpacing *
row.additionalScale + horizontalSpacing), 0) / 2)
+ row.x = area.x + (Math.max(area.width - (widthWithoutSpacing *
row.additionalScale + horizontalSpacing), 0) / 2);
row.y = area.y + (Math.max(area.height - (heightWithoutSpacing +
verticalSpacing), 0) / 2) + y;
y += row.height * row.additionalScale + this._rowSpacing;
}
@@ -374,8 +318,6 @@
function enable() {
initClassicOverridesSchema();
- toggleAppMenu();
-
mainPanelActorAllocateId = Main.panel.actor.connect('allocate',
Lang.bind(Main.panel, sle_classic_allocate));
Main.layoutManager._updateBoxes = _updateBoxesNew;
@@ -394,6 +336,8 @@
Main.layoutManager.panelBox.set_position(primaryMonitor.x,
primaryMonitor.y + primaryMonitor.height -
Main.panel.actor.height);
}));
+
+ Main.layoutManager._monitorsChanged();
}
function disable() {
