From 8132cd7d9664e8fe509e6096b99ac11032e6f4ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20J=C3=B8rgen=20Br=C3=B8nner?= <olejorgenb@yahoo.no>
Date: Sat, 9 Sep 2017 18:53:51 +0200
Subject: [PATCH] Set initial position in `focus` handler:

Position changes from `window-added` handler seems to be overwritten/ignored.

+ some animation changes
---
 tiling.js | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/tiling.js b/tiling.js
index 28ef1c3..af1e3c2 100644
--- a/tiling.js
+++ b/tiling.js
@@ -54,7 +54,7 @@ glib = imports.gi.GLib
 
 Tweener = imports.ui.tweener;
 margin = 75
-move = (meta_window, x, y) => {
+move = (meta_window, x, y, onComplete) => {
     let actor = meta_window.get_compositor_private()
     let buffer = actor.meta_window.get_buffer_rect();
     let frame = actor.meta_window.get_frame_rect();
@@ -73,6 +73,7 @@ move = (meta_window, x, y) => {
                              , scale_y: scale
                              , onComplete: () => {
                                  actor.meta_window.move_frame(true, x, y);
+                                 onComplete && onComplete();
                              }})
 
 }
@@ -112,10 +113,18 @@ framestr = (rect) => {
 focus_handler = (meta_window, user_data) => {
     log("focus", meta_window, framestr(meta_window.get_frame_rect()));
 
-    ensure_viewport(meta_window)
-    meta_window.activate(timestamp())
-
-    // focus = pages.indexOf(meta_window)
+    if(meta_window.scrollwm_initial_position) {
+        log("setting initial position", meta_window.scrollwm_initial_position)
+        move(meta_window, meta_window.scrollwm_initial_position.x, meta_window.scrollwm_initial_position.y, () => {
+            log("initial postition complete")
+            ensure_viewport(meta_window);
+        })
+        propogate_forward(pages.indexOf(meta_window)+1,
+                          meta_window.scrollwm_initial_position.x + meta_window.get_frame_rect().width + window_gap);
+        delete meta_window.scrollwm_initial_position;
+    } else {
+        ensure_viewport(meta_window)
+    }
 }
 
 propogate_forward = (n, x, lower) => {
@@ -153,14 +162,13 @@ add_handler = (ws, meta_window) => {
 
     if (focus_i > -1) {
         let frame = pages[focus_i].get_frame_rect()
-        print("position: " + (frame.x + frame.width))
-        print("before resize")
-        meta_window.move_resize_frame(true, frame.x + frame.width + overlap, 20, meta_window.get_frame_rect().width, global.screen_height - 20 - margin_tb*2)
-        print("after resize")
+        meta_window.scrollwm_initial_position = {x:frame.x + frame.width + overlap, y:20};
+
+        // Maxmize height. Setting position here doesn't work... 
+        meta_window.move_resize_frame(true, 0, 0,
+                                      meta_window.get_frame_rect().width, global.screen_height - 20 - margin_tb*2)
     }
     meta_window.connect("focus", focus_wrapper)
-
-    ensure_viewport(meta_window)
 }
 
 remove_handler = (ws, meta_window) => {