Improve display, handle grid view on files app

2 files changed, 12 insertions, 25 deletions

diff --git a/js/files.js b/js/files.js
index 92daedb..bb4c548 100644
--- a/js/files.js
+++ b/js/files.js
@@ -10,10 +10,10 @@ var RightClick = RightClick || {};
 
     var appName = RightClick.appName;
 
-    new RightClick.Menu($('tbody[id=fileList]'), function (event, currentFile, delimiter) {
+    new RightClick.Menu($('tbody[id=fileList]'), function (event, context, delimiter) {
         var options = new RightClick.Options();
         var openSubOptions = new RightClick.Options();
-
+        var currentFile = $(event.target).closest('tr');
         currentFile.find('.action-menu').click();
 
         var menu = currentFile.find('.fileActionsMenu');
@@ -170,6 +170,6 @@ var RightClick = RightClick || {};
 
         return options;
     }, $('#controls').css('z-index') - 1).setContext(function (event) {
-        return $(event.target).closest('tr');
+        return $('#app-content-files #fileList');
     });
 })(window, jQuery, RightClick);
diff --git a/js/script.js b/js/script.js
index a89ebbe..a3b497d 100644
--- a/js/script.js
+++ b/js/script.js
@@ -287,34 +287,21 @@ var RightClick = RightClick || {};
                 });
             }
             else {
-                var top = event.pageY + delimiter.position().top - delimiter.offset().top + 5;
-                var left = event.pageX + delimiter.position().left - delimiter.offset().left - 5;
-                var arrow = (div.width() / 2);
-                var space = div.outerWidth(true) - div.innerWidth();
-
-                if (left < 0) {
-                    arrow += left;
+                var getCssPx = function (context, css) {
+                    return -- context.css(css).replace('px', '');
+                }
 
-                    if (arrow < space) {
-                        arrow = space;
-                        div.css('border-top-left-radius', 0);
-                    }
+                var top = event.pageY + delimiter.position().top - delimiter.offset().top + getCssPx(context, "marginTop") + 5;
+                var left = event.pageX + delimiter.position().left - delimiter.offset().left - getCssPx(context, "marginLeft") - 5;
 
+                if (left < 0) {
                     left = 0;
                 }
-                else if (left + div.outerWidth(true) >= delimiter.width()) {
-                    var newLeft = delimiter.width() - div.outerWidth(true) - 1;
-                    arrow += left - newLeft;
-
-                    if (arrow > div.width() - space) {
-                        arrow = div.width() - space;
-                        div.css('border-top-right-radius', 0);
-                    }
-
-                    left = newLeft;
+                else if (left + div.outerWidth(true) >= delimiter.width() - getCssPx(context, "marginRight")) {
+                    left = delimiter.width() - div.outerWidth(true) - 1;
                 }
 
-                if (top + div.outerHeight(true) >= $(window).height()) {
+                if (top + div.outerHeight(true) >= $(window).height() - getCssPx(context, "marginBottom")) {
                     top -= div.outerHeight(true);
                 }