Fix / improve window behaviour: restore pre-fullscreen/pre-scratch window size/position; better manage windows that start fullscreen

keybindings.js

@@ -252,10 +252,13 @@ export function setupActions(settings) {
 
     registerPaperAction('paper-toggle-fullscreen',
         metaWindow => {
-            if (metaWindow.fullscreen)
+            if (metaWindow.fullscreen) {
                 metaWindow.unmake_fullscreen();
-            else
+            }
+            else {
                 metaWindow.make_fullscreen();
+            }
+            Tiling.resizeHandler(metaWindow);
         }, Meta.KeyBindingFlags.PER_WINDOW);
 }
 

scratch.js

@@ -112,8 +112,16 @@ export function makeScratch(metaWindow) {
         if (!metaWindow.minimized) {
             metaWindow.move_resize_frame(true, f.x, f.y,
                 targetFrame.width, targetFrame.height);
-            easeScratch(metaWindow, targetFrame.x, targetFrame.y,
-                { onComplete: () => delete metaWindow[scratchFrame] });
+            easeScratch(
+                metaWindow,
+                targetFrame.x,
+                targetFrame.y,
+                {
+                    onComplete: () => {
+                        delete metaWindow[scratchFrame];
+                        Main.activateWindow(metaWindow);
+                    },
+                });
         } else {
             // Can't restore the scratch geometry immediately since it distort the minimize animation
             // ASSUMPTION: minimize animation is not disabled and not already done

settings.js

@@ -31,7 +31,8 @@ export function enable(extension) {
     acceleratorParse = new AcceleratorParse();
     _overriddingConflicts = false;
     prefs = {};
-    ['window-gap', 'vertical-margin', 'vertical-margin-bottom', 'horizontal-margin',
+    [
+        'window-gap', 'vertical-margin', 'vertical-margin-bottom', 'horizontal-margin',
         'workspace-colors', 'default-background', 'animation-time', 'default-show-top-bar',
         'swipe-sensitivity', 'swipe-friction', 'cycle-width-steps', 'cycle-height-steps',
         'maximize-width-percent', 'minimap-scale', 'edge-preview-scale',