fix_of_relative_position_of_window_on_mac
This commit is contained in:
1 parent
b1aec97a2d
commit
4299251ee0
751 files changed
+269537
-55
No files matched your search
+14
-51
@@ -379,64 +379,26 @@ function display_div(middle, x, y)
|
||||
|
||||
while(find_root.parent && find_root.parent != find_root && is_not_frameset(find_root))
|
||||
{
|
||||
let rect = find_root.frameElement.getBoundingClientRect();
|
||||
let rx = rect.x;
|
||||
let ry = rect.y;
|
||||
let sx1 = find_root.parent.scrollX;
|
||||
let sy1 = find_root.parent.scrollY;
|
||||
let sx2 = find_root.scrollX;
|
||||
let sy2 = find_root.scrollY;
|
||||
find_root = find_root.parent;
|
||||
newx += (rx + sx1 - sx2);
|
||||
newy += (ry + sy1 - sy2);
|
||||
try
|
||||
{
|
||||
let frame_element = find_root.frameElement;
|
||||
if(!frame_element)
|
||||
break;
|
||||
|
||||
let rect = frame_element.getBoundingClientRect();
|
||||
let rx = rect.x;
|
||||
let ry = rect.y;
|
||||
|
||||
let parent_window = find_root.parent;
|
||||
|
||||
let sx1 = 0;
|
||||
let sy1 = 0;
|
||||
let sx2 = 0;
|
||||
let sy2 = 0;
|
||||
|
||||
try
|
||||
{
|
||||
sx1 = parent_window.scrollX || 0;
|
||||
sy1 = parent_window.scrollY || 0;
|
||||
}
|
||||
catch(err)
|
||||
{
|
||||
// Cross-origin parent frame. Chromium blocks access.
|
||||
break;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
sx2 = find_root.scrollX || 0;
|
||||
sy2 = find_root.scrollY || 0;
|
||||
}
|
||||
catch(err)
|
||||
{
|
||||
sx2 = 0;
|
||||
sy2 = 0;
|
||||
}
|
||||
|
||||
find_root = parent_window;
|
||||
newx += (rx + sx1 - sx2);
|
||||
newy += (ry + sy1 - sy2);
|
||||
|
||||
try
|
||||
{
|
||||
mydoc = find_root.document;
|
||||
}
|
||||
catch(err)
|
||||
{
|
||||
break;
|
||||
}
|
||||
mydoc = find_root.document;
|
||||
}
|
||||
catch(err)
|
||||
{
|
||||
console.warn("Nazeka frame positioning warning:", err);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
let basewidth = Math.round(Number(settings.width));
|
||||
if(settings.x_dodge != 1 && basewidth > mydoc.documentElement.getBoundingClientRect().width/2 - settings.xoffset - 5)
|
||||
@@ -497,7 +459,8 @@ function display_div(middle, x, y)
|
||||
styletext += " transform-origin: top left; transform: scale(" + Number(settings.scale) + ");";
|
||||
|
||||
outer.style = styletext;
|
||||
|
||||
|
||||
|
||||
let mywidth = basewidth*settings.scale;
|
||||
if(!settings.fixedwidthpositioning)
|
||||
mywidth = outer.offsetWidth*settings.scale;
|
||||
|
||||
Reference in new issue
Block a user