From 2d9cf195d7330817a2e11762055508fab57f721c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Tue, 12 Feb 2013 21:58:30 +0100
Subject: [PATCH] layout: Remove obsolete message tray <=> OSK interaction code

Message tray and on-screen keyboard are now exclusive, so remove
all code that shuffles boxes around to make it possible to show
both at the same time.

https://bugzilla.gnome.org/show_bug.cgi?id=662687
---
 js/ui/layout.js | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/js/ui/layout.js b/js/ui/layout.js
index 7f757094c..4dc3f6156 100644
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -317,13 +317,6 @@ const LayoutManager = new Lang.Class({
         this.trayBox.set_position(this.bottomMonitor.x,
                                   this.bottomMonitor.y + this.bottomMonitor.height);
         this.trayBox.set_size(this.bottomMonitor.width, -1);
-
-        // Set trayBox's clip to show things above it, but not below
-        // it (so it's not visible behind the keyboard). The exact
-        // height of the clip doesn't matter, as long as it's taller
-        // than any Notification.actor.
-        this.trayBox.set_clip(0, -this.bottomMonitor.height,
-                              this.bottomMonitor.width, this.bottomMonitor.height);
     },
 
     _panelBoxChanged: function() {
@@ -505,15 +498,6 @@ const LayoutManager = new Lang.Class({
                            onComplete: this._showKeyboardComplete,
                            onCompleteScope: this
                          });
-
-        if (this.keyboardIndex == this.bottomIndex) {
-            Tweener.addTween(this.trayBox,
-                             { anchor_y: this.keyboardBox.height,
-                               time: KEYBOARD_ANIMATION_TIME,
-                               transition: 'easeOutQuad'
-                             });
-        }
-
         this.emit('keyboard-visible-changed', true);
     },
 
@@ -524,8 +508,6 @@ const LayoutManager = new Lang.Class({
 
         this._keyboardHeightNotifyId = this.keyboardBox.connect('notify::height', Lang.bind(this, function () {
             this.keyboardBox.anchor_y = this.keyboardBox.height;
-            if (this.keyboardIndex == this.bottomIndex)
-                this.trayBox.anchor_y = this.keyboardBox.height;
         }));
     },
 
@@ -542,14 +524,6 @@ const LayoutManager = new Lang.Class({
                            onCompleteScope: this
                          });
 
-        if (this.keyboardIndex == this.bottomIndex) {
-            Tweener.addTween(this.trayBox,
-                             { anchor_y: 0,
-                               time: immediate ? 0 : KEYBOARD_ANIMATION_TIME,
-                               transition: 'easeOutQuad'
-                             });
-        }
-
         this.emit('keyboard-visible-changed', false);
     },