osdWindow: cleanup unused code.

The convertIndex argument is never true by any callers, drop
convertGdkIndex and clean up.

Author: mtwebster

js/ui/cinnamonDBus.js

@@ -177,7 +177,7 @@ var CinnamonDBus = class {
         if (params['icon'])
             icon = Gio.Icon.new_for_string(params['icon']);
 
-        Main.osdWindowManager.show(monitorIndex, icon, params['label'], params['level'], false);
+        Main.osdWindowManager.show(monitorIndex, icon, params['label'], params['level']);
     }
 
     get OverviewActive() {

js/ui/gestures/actions.js

@@ -365,7 +365,7 @@ var VolumeAction = class extends BaseAction {
             return;
         }
 
-        Main.osdWindowManager.show(-1, this._get_volume_icon(int_pct, false), null, int_pct, false);
+        Main.osdWindowManager.show(-1, this._get_volume_icon(int_pct, false), null, int_pct);
         this.last_time = time;
     }
 
@@ -380,7 +380,7 @@ var VolumeAction = class extends BaseAction {
         sink.change_is_muted(!is_muted);
 
         const percent = !is_muted ? 0 : (sink.volume / this.pct_step).clamp(0, 100);
-        Main.osdWindowManager.show(-1, this._get_volume_icon(percent), null, percent, false);
+        Main.osdWindowManager.show(-1, this._get_volume_icon(percent), null, percent);
     }
 
     _get_volume_icon(volume_pct) {
@@ -434,7 +434,7 @@ var VolumeAction = class extends BaseAction {
             int_pct = 100 - int_pct;
         }
 
-        Main.osdWindowManager.show(-1, this._get_volume_icon(int_pct), null, int_pct, false);
+        Main.osdWindowManager.show(-1, this._get_volume_icon(int_pct), null, int_pct);
     }
 }
 

js/ui/osdWindow.js

@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
-const Gdk = imports.gi.Gdk;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
@@ -16,21 +15,6 @@ const LEVEL_ANIMATION_TIME = 100;
 const FADE_TIME = 100;
 const HIDE_TIMEOUT = 1500;
 
-function convertGdkIndex(monitorIndex) {
-    let screen = Gdk.Screen.get_default();
-    let rect = screen.get_monitor_geometry(monitorIndex);
-    let cx = rect.x + rect.width / 2;
-    let cy = rect.y + rect.height / 2;
-    for (let i = 0; i < Main.layoutManager.monitors.length; i++) {
-        let monitor = Main.layoutManager.monitors[i];
-        if (cx >= monitor.x && cx < monitor.x + monitor.width &&
-            cy >= monitor.y && cy < monitor.y + monitor.height)
-            monitorIndex = i;
-    }
-
-    return monitorIndex;
-};
-
 var OsdWindow = GObject.registerClass(
 class OsdWindow extends Clutter.Actor {
     _init(monitorIndex) {
@@ -199,13 +183,11 @@ var OsdWindowManager = class {
         this._osdWindows[monitorIndex].show();
     }
 
-    show(monitorIndex, icon, label, level, convertIndex) {
+    show(monitorIndex, icon, label, level) {
         if (this._osdWindows.length === 0)
             return;
 
         if (monitorIndex !== -1) {
-            if (convertIndex)
-                monitorIndex = convertGdkIndex(monitorIndex);
             for (let i = 0; i < this._osdWindows.length; i++) {
                 if (i === monitorIndex)
                     this._showOsdWindow(i, icon, label, level);