windowMenu: Port from Meta.ScreenDirection to Meta.DisplayDirection

Meta.ScreenDirection no longer exists. This fixes window menus on
multi-monitor systems.

	JS ERROR: TypeError: Meta.ScreenDirection is undefined
	_buildMenu@resource:///org/gnome/shell/ui/windowMenu.js:135:17
This commit is contained in:
Jürg Billeter 2018-09-11 12:55:55 +02:00
parent 7778d1c308
commit 2d791a51c0

View File

@ -132,7 +132,7 @@ var WindowMenu = new Lang.Class({
if (nMonitors > 1 && monitorIndex >= 0) { if (nMonitors > 1 && monitorIndex >= 0) {
this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
let dir = Meta.ScreenDirection.UP; let dir = Meta.DisplayDirection.UP;
let upMonitorIndex = let upMonitorIndex =
display.get_monitor_neighbor_index(monitorIndex, dir); display.get_monitor_neighbor_index(monitorIndex, dir);
if (upMonitorIndex != -1) { if (upMonitorIndex != -1) {
@ -141,7 +141,7 @@ var WindowMenu = new Lang.Class({
}); });
} }
dir = Meta.ScreenDirection.DOWN; dir = Meta.DisplayDirection.DOWN;
let downMonitorIndex = let downMonitorIndex =
display.get_monitor_neighbor_index(monitorIndex, dir); display.get_monitor_neighbor_index(monitorIndex, dir);
if (downMonitorIndex != -1) { if (downMonitorIndex != -1) {
@ -150,7 +150,7 @@ var WindowMenu = new Lang.Class({
}); });
} }
dir = Meta.ScreenDirection.LEFT; dir = Meta.DisplayDirection.LEFT;
let leftMonitorIndex = let leftMonitorIndex =
display.get_monitor_neighbor_index(monitorIndex, dir); display.get_monitor_neighbor_index(monitorIndex, dir);
if (leftMonitorIndex != -1) { if (leftMonitorIndex != -1) {
@ -159,7 +159,7 @@ var WindowMenu = new Lang.Class({
}); });
} }
dir = Meta.ScreenDirection.RIGHT; dir = Meta.DisplayDirection.RIGHT;
let rightMonitorIndex = let rightMonitorIndex =
display.get_monitor_neighbor_index(monitorIndex, dir); display.get_monitor_neighbor_index(monitorIndex, dir);
if (rightMonitorIndex != -1) { if (rightMonitorIndex != -1) {