1.5, merge from dev

Merge pull request #31 from emvaized/dev

Author: emvaized

CHANGELOG

@@ -1,3 +1,11 @@
+1.5
+- Fixed unwanted assist show on Wayland
+- Windows now will get unshaded after selecting from assist
+- Assit will now try to filter out windows from other activities
+- Increased default opacity for assist background
+- Updated configs page design and layout
+- Remove window from snap group when move it to another desktop
+
 1.4
 New options:
 - Raise snapped windows together

assets/logo.png

@@ -88,6 +88,7 @@ function checkToShowNextQuaterAssist(lastSelectedClient){
     } else {
         /// no other quaters to show assist — we can reset the variables
         finishSnap(true);
+        preventAssistFromShowing();
         return false;
     }
 }

contents/ui/code/assist.js

@@ -1,5 +1,6 @@
 function selectClient(client){
     client.setMaximize(false, false);
+    client.shade = false;
     client.frameGeometry = Qt.rect(
         mainWindow.x - (assistPadding / 2),
         mainWindow.y - (assistPadding / 2),
@@ -38,10 +39,14 @@ function addListenersToClient(client) {
     client.windowClosed.connect(function(window){
         handleWindowClose(client);
     });
+
+    client.desktopChanged.connect(function(){
+        if (trackSnappedWindows && !client.resize) removeWindowFromTrack(client.windowId);
+    });
 }
 
 function onWindowResize(window) {
-    if (activated) AssistManager.hideAssist();
+    if (activated) return;
     AssistManager.finishSnap(false); /// make sure we cleared all variables
 
     const maxArea = workspace.clientArea(KWin.MaximizeArea, window);
@@ -159,7 +164,7 @@ function handleWindowFocus(window) {
 
             for(let i = 0, l = windows.length; i < l; i++) {
                 if (windows[i] !== window.windowId) {
-                    const w = workspace.getClient(windows[i]);
+                    const w = getClientFromId(windows[i]);
                     if (w && !w.minimized) workspace.activeClient = w;
                 }
             }
@@ -192,7 +197,7 @@ function applyActionToAssosiatedSnapGroup(client, callback){
     const i = snappedWindowGroups.findIndex((group) => group.windows.includes(client.windowId));
     if (i > -1) {
         const windows = snappedWindowGroups[i].windows;
-        windows.forEach(windowId => callback(workspace.getClient(windowId)));
+        windows.forEach(windowId => callback(getClientFromId(windowId)));
     }
 }
 
@@ -218,7 +223,7 @@ function fillClosedWindow(closedWindow, group){
     const closedWindowGeom = closedWindow.frameGeometry;
     const remainingWindows = group.windows;
     for(let i = 0, l = remainingWindows.length; i < l; i++){
-        const window = workspace.getClient(remainingWindows[i]);
+        const window = getClientFromId(remainingWindows[i]);
         if (!window) continue;
         if (window.windowId == closedWindow.windowId) continue;
         const windowGeom = window.frameGeometry;
@@ -244,13 +249,21 @@ function isEqual(a, b) {
     return a - b <= snapDetectPrecision && a - b >= -snapDetectPrecision;
 }
 
+function getClientFromId(windowId){
+    return workspace.getClient(windowId);
+
+    /// Need to figure out reliable way for Wayland
+    /// return Object.values(workspace.clients).find((el, index, arr) => el.windowId == windowId);
+}
+
 function shouldShowWindow(client) {
     if (filteredClients.includes(client)) return false;
     if (client.active || client.specialWindow) return false;
     if (!showMinimizedWindows && client.minimized) return false;
     if (!showOtherScreensWindows && client.screen !== workspace.activeScreen) return false;
     if (!showOtherDesktopsWindows && client.desktop !== workspace.currentDesktop) return false;
     if (!showSnappedWindows && snappedWindowGroups.findIndex(group => group.windows.includes(client.windowId)) > -1) return false;
+    if (client.activities.length > 0 && !client.activities.includes(workspace.currentActivity)) return false;
     return true;
 }