Browse Source

Fixed minor css bug on detecting fixed windows

Toby Chui 3 năm trước cách đây
mục cha
commit
4aa6a9955b
1 tập tin đã thay đổi với 8 bổ sung7 xóa
  1. 8 7
      web/desktop.system

+ 8 - 7
web/desktop.system

@@ -1679,7 +1679,7 @@
 
                 //Add cusor change on resizble position reach
                 let hoverOffset = [event.pageX - $(this).offset().left, event.pageY - $(this).offset().top];
-                if (hoverOffset[1] <= 3){
+                if (hoverOffset[1] <= 3 && !$(this).parent().hasClass("fixedsize")){
                     $(this).addClass("resizbleCursor");
                 }else{
                     $(this).removeClass("resizbleCursor");
@@ -1781,9 +1781,6 @@
             $(".iframewrapper").off("mousedown").on("mousedown", function(evt) {
                 evt.preventDefault();
                 evt.stopImmediatePropagation();
-                if ($(this).parent().hasClass("fixedsize")) {
-                    return false;
-                }
                 resizeDown($(this).parent(), evt);
             });
 
@@ -2004,6 +2001,10 @@
         let minxWidth = 120;
         let minHeight = 100;
         function resizeDown(object, event) {
+            if ($(this).hasClass("fixedsize")) {
+                return false;
+            }
+            
             //Mouse down, start resizing
             resizingWindow = true;
             resizingWindowTarget = object;
@@ -2046,7 +2047,7 @@
                 //Bottom Edge
                 resizingEdgeID = 3;
                 $(object).find(".iframewrapper").css('cursor', 's-resize');
-            } 
+            }
 
             //For upper edge, see fwdown() handler
         }
@@ -2203,10 +2204,10 @@
             
             //Get the relative click offset of the down event
             clickDownOffset = [event.pageX - $(object).offset().left, event.pageY - $(object).offset().top];
-            if (clickDownOffset[1] <= 3){
+            if (clickDownOffset[1] <= 3 && !$(object).hasClass("fixedsize")){
                 //Resizing Top Edge
                 resizingWindow = true;
-                resizingWindowTarget = $(object).parent();
+                resizingWindowTarget = $(object);
                 resizingEdgeID = 6;
             }else{
                 //Moving Window