From ada21c975f1087910fc3c9a0f7e1afecb5976a56 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Mon, 13 Feb 2017 11:55:24 +0100 Subject: [PATCH] padOsd: peek pads attached to the same tablet https://bugzilla.gnome.org/show_bug.cgi?id=779986 --- js/ui/padOsd.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/js/ui/padOsd.js b/js/ui/padOsd.js index e43b9a04f..e172a6e4f 100644 --- a/js/ui/padOsd.js +++ b/js/ui/padOsd.js @@ -528,6 +528,7 @@ const PadOsd = new Lang.Class({ _init: function (padDevice, settings, imagePath, editionMode, monitorIndex) { this.padDevice = padDevice; + this._groupPads = [ padDevice ]; this._settings = settings; this._imagePath = imagePath; this._editionMode = editionMode; @@ -540,6 +541,13 @@ const PadOsd = new Lang.Class({ this.destroy(); })); + deviceManager.list_devices().forEach(Lang.bind(this, function(device) { + if (device != this.padDevice && + device.get_device_type() == Clutter.InputDeviceType.PAD_DEVICE && + this.padDevice.is_grouped(device)) + this._groupPads.push(device); + })); + this.actor = new St.BoxLayout({ style_class: 'pad-osd-window', x_expand: true, y_expand: true,