From 459ed0b262255311165a431634500c68c7e58baf Mon Sep 17 00:00:00 2001
From: Marcio Mazza <mazza@interlegis.leg.br>
Date: Thu, 29 Jan 2015 18:48:00 -0200
Subject: [PATCH 1/2] Limit handle position to window visible area

---
 debug_toolbar/static/debug_toolbar/js/toolbar.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debug_toolbar/static/debug_toolbar/js/toolbar.js b/debug_toolbar/static/debug_toolbar/js/toolbar.js
index 7bd10454a..679ef0619 100644
--- a/debug_toolbar/static/debug_toolbar/js/toolbar.js
+++ b/debug_toolbar/static/debug_toolbar/js/toolbar.js
@@ -217,6 +217,7 @@
             // set handle position
             var handleTop = djdt.cookie.get('djdttop');
             if (handleTop) {
+                handleTop = Math.min(handleTop, window.innerHeight - 100)
                 $('#djDebugToolbarHandle').css({top: handleTop + 'px'});
             }
             // Unbind keydown

From d3fcd4e2bb7dbc64144b7264b3f259c3552f9430 Mon Sep 17 00:00:00 2001
From: Marcio Mazza <mazza@interlegis.leg.br>
Date: Mon, 9 Feb 2015 17:08:19 -0200
Subject: [PATCH 2/2] Consider handle height for position on visible area

---
 debug_toolbar/static/debug_toolbar/js/toolbar.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/debug_toolbar/static/debug_toolbar/js/toolbar.js b/debug_toolbar/static/debug_toolbar/js/toolbar.js
index 679ef0619..a1b2500d6 100644
--- a/debug_toolbar/static/debug_toolbar/js/toolbar.js
+++ b/debug_toolbar/static/debug_toolbar/js/toolbar.js
@@ -141,13 +141,13 @@
                     // due to djdt.handleDragged being set to true.
                     if (djdt.handleDragged || event.pageY != startPageY) {
                         var top = baseY + event.clientY;
-                        
+
                         if (top < 0) {
                             top = 0;
                         } else if (top + handle.height() > windowHeight) {
                             top = windowHeight - handle.height();
                         }
-                        
+
                         handle.css({top: top});
                         djdt.handleDragged = true;
                     }
@@ -213,12 +213,13 @@
             $('#djDebugToolbar li').removeClass('djdt-active');
             // finally close toolbar
             $('#djDebugToolbar').hide('fast');
-            $('#djDebugToolbarHandle').show();
+            handle = $('#djDebugToolbarHandle')
+            handle.show();
             // set handle position
             var handleTop = djdt.cookie.get('djdttop');
             if (handleTop) {
-                handleTop = Math.min(handleTop, window.innerHeight - 100)
-                $('#djDebugToolbarHandle').css({top: handleTop + 'px'});
+                handleTop = Math.min(handleTop, window.innerHeight - handle.outerHeight() - 10)
+                handle.css({top: handleTop + 'px'});
             }
             // Unbind keydown
             $(document).unbind('keydown.djDebug');