Selaa lähdekoodia

Fixed docking fixsize window bug

Toby Chui 1 vuosi sitten
vanhempi
commit
4da376b8b0
1 muutettua tiedostoa jossa 11 lisäystä ja 2 poistoa
  1. 11 2
      web/desktop.system

+ 11 - 2
web/desktop.system

@@ -2619,11 +2619,12 @@
                     $(object).find(".dockleft").removeClass("disabled");
                 }
 
-                if (event.pageX < 20) {
+                let fwNoResize = $(object).hasClass("fixedsize");
+                if (event.pageX < 20 && !fwNoResize) {
                     //Show dock to left indicator
                     $("#fwdockLeftIndicator").show();
                     $("#fwdockRightIndicator").hide();
-                } else if (event.pageX > window.innerWidth - 20) {
+                } else if (event.pageX > window.innerWidth - 20 && !fwNoResize) {
                     //Show dock to right indicator
                     $("#fwdockLeftIndicator").hide();
                     $("#fwdockRightIndicator").show();
@@ -2642,6 +2643,10 @@
 
         //Dock the window object to left
         function dockWindowToLeft(object){
+            if ($(object).hasClass("fixedsize")){
+                //This windows do now allow resizing
+                return;
+            }
             var originalSize = [$(object).width(), $(object).height(), $(object).offset().left, $(object).offset().top];
             $(object).attr("orgsize", encodeURIComponent(JSON.stringify(originalSize)));
             $(object).css({
@@ -2659,6 +2664,10 @@
 
         //Dock the window object to right
         function dockWindowToRight(object){
+            if ($(object).hasClass("fixedsize")){
+                //This windows do now allow resizing
+                return;
+            }
             var originalSize = [$(object).width(), $(object).height(), $(object).offset().left, $(object).offset().top];
             $(object).attr("orgsize", encodeURIComponent(JSON.stringify(originalSize)));
             $(object).css({