wait #4582 @1.5

diff --git a/inc/ws/Util/html5/master/class.ws.html5.links.php b/inc/ws/Util/html5/master/class.ws.html5.links.php
index dfa562ce3333bfbc5385bd27bbe83945d2376abc..acac53a8a4ad8e08d238907edc9a02c4de7d54a6 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -550,7 +550,7 @@ class wsHTML5Link
 
     public function getCSSZIndex()
     {
-        $zindex = $this->getAddZIndex() + (($this->getDepth() + 1) * 1000) - min(999, round(($this->width * $this->height) / 300));
+        $zindex = $this->getAddZIndex() + (($this->getDepth() + 1) * 1000) - min(999, round(999 * (($this->width * $this->height) / ($this->compiler->width * 2 * $this->compiler->height))));
         return 'z-index:' . $zindex . ';';
     }
 
@@ -945,7 +945,6 @@ class htmlMultimediaPopupImage extends normalLink
 class contentLink extends wsHTML5Link
 {
     public $defaultZIndex = 30;
-    public $animZindex = 0;
 
     public function getHTMLContainerClass()
     {
@@ -962,7 +961,7 @@ class contentLink extends wsHTML5Link
                 unset($animation['blendmode']);
             }
             if (isset($animation['zindex'])) {
-                $this->animZindex = $animation['zindex'];
+                $this->zindex = $animation['zindex'];
             }
         }
         $res .= ' data-animations="' . htmlspecialchars(json_encode($animations), ENT_QUOTES) . '" ';
@@ -997,11 +996,6 @@ class contentLink extends wsHTML5Link
         }
         return false;
     }
-
-    public function getAddZIndex()
-    {
-        return parent::getAddZIndex() + $this->animZindex;
-    }
 }
 
 class eventOverlayLink extends wsHTML5Link