decorations: fix get xid error on wayland

hardpixel · Nov 29, 2018 · 44878d4 · 44878d4
1 parent ead06a8
commit 44878d4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/unite@hardpixel.eu/helpers.js b/unite@hardpixel.eu/helpers.js
@@ -63,6 +63,13 @@ function scaleSize(initialSize) {
   return initialSize * context.scale_factor;
 }
 
+function getWindowXID(win) {
+  let desc  = win.get_description().toString();
+  let match = desc.match(/0x[0-9a-f]+/) || [null];
+
+  return match[0];
+}
+
 function isWindow(win) {
   if (!win) return;
 

diff --git a/unite@hardpixel.eu/modules/windowDecoration.js b/unite@hardpixel.eu/modules/windowDecoration.js
@@ -3,6 +3,7 @@ const GLib           = imports.gi.GLib;
 const Util           = imports.misc.util;
 const Unite          = imports.misc.extensionUtils.getCurrentExtension();
 const Base           = Unite.imports.module.BaseModule;
+const getWindowXID   = Unite.imports.helpers.getWindowXID;
 const isWindow       = Unite.imports.helpers.isWindow;
 const isMaximized    = Unite.imports.helpers.isMaximized;
 const loadUserStyles = Unite.imports.helpers.loadUserStyles;
@@ -31,7 +32,7 @@ var WindowDecoration = new Lang.Class({
   },
 
   _getWindowXID(win) {
-    win._windowXID = win._windowXID || win.get_description().match(/0x[0-9a-f]+/)[0];
+    win._windowXID = win._windowXID || getWindowXID(win);
     return win._windowXID;
   },