lightcordwarez
/
BetterDiscordAddons
mirror of https://github.com/mwittrien/BetterDiscordAddons.git
1
0
Fork 0
Code Issues 18 Releases Wiki Activity

fixes

This commit is contained in:
Mirco Wittrien 2020-01-05 18:31:12 +01:00
parent d72f178f75
commit 78036146fc
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Plugins/BDFDB.js
View File

@ -3079,14 +3079,30 @@
} }
return 0; return 0;
}; };
BDFDB.DOMUtils.getInnerHeight = function (node) {
if (Node.prototype.isPrototypeOf(node) && node.nodeType != Node.TEXT_NODE) {
let rects = BDFDB.DOMUtils.getRects(node);
let style = getComputedStyle(node);
return rects.height - parseInt(style.paddingTop) - parseInt(style.paddingBottom);
}
return 0;
};
BDFDB.DOMUtils.getWidth = function (node) { BDFDB.DOMUtils.getWidth = function (node) {
if (Node.prototype.isPrototypeOf(node) && node.nodeType != Node.TEXT_NODE) { if (Node.prototype.isPrototypeOf(node) && node.nodeType != Node.TEXT_NODE) {
var rects = BDFDB.DOMUtils.getRects(node); let rects = BDFDB.DOMUtils.getRects(node);
var style = getComputedStyle(node); let style = getComputedStyle(node);
return rects.width + parseInt(style.marginLeft) + parseInt(style.marginRight); return rects.width + parseInt(style.marginLeft) + parseInt(style.marginRight);
} }
return 0; return 0;
}; };
BDFDB.DOMUtils.getInnerWidth = function (node) {
if (Node.prototype.isPrototypeOf(node) && node.nodeType != Node.TEXT_NODE) {
let rects = BDFDB.DOMUtils.getRects(node);
let style = getComputedStyle(node);
return rects.width - parseInt(style.paddingLeft) - parseInt(style.paddingRight);
}
return 0;
};
BDFDB.DOMUtils.appendWebScript = function (path, container) { BDFDB.DOMUtils.appendWebScript = function (path, container) {
if (!container && !document.head.querySelector("bd-head bd-scripts")) document.head.appendChild(BDFDB.DOMUtils.create(`<bd-head><bd-scripts></bd-scripts></bd-head>`)); if (!container && !document.head.querySelector("bd-head bd-scripts")) document.head.appendChild(BDFDB.DOMUtils.create(`<bd-head><bd-scripts></bd-scripts></bd-head>`));
container = container || document.head.querySelector("bd-head bd-scripts") || document.head; container = container || document.head.querySelector("bd-head bd-scripts") || document.head;
@ -8055,16 +8071,16 @@
}), }),
ref: instance => { ref: instance => {
let ele = BDFDB.ReactUtils.findDOMNode(instance); let ele = BDFDB.ReactUtils.findDOMNode(instance);
if (ele) { if (ele && ele.parentElement) {
var inner = ele.firstElementChild; ele.style.setProperty("max-width", `${BDFDB.DOMUtils.getInnerWidth(ele.parentElement)}px`);
var Animation = new LibraryModules.AnimationUtils.Value(0); let Animation = new LibraryModules.AnimationUtils.Value(0);
Animation Animation
.interpolate({inputRange:[0, 1], outputRange:[0, (BDFDB.DOMUtils.getRects(inner).width - BDFDB.DOMUtils.getRects(ele).width) * -1]}) .interpolate({inputRange:[0, 1], outputRange:[0, (BDFDB.DOMUtils.getRects(ele.firstElementChild).width - BDFDB.DOMUtils.getRects(ele).width) * -1]})
.addListener(v => {inner.style.setProperty("left", v.value + "px", "important");}); .addListener(v => {ele.firstElementChild.style.setProperty("left", v.value + "px", "important");});
this.scroll = p => { this.scroll = p => {
var w = p + parseFloat(inner.style.getPropertyValue("left")) / (BDFDB.DOMUtils.getRects(inner).width - BDFDB.DOMUtils.getRects(ele).width); let w = p + parseFloat(ele.firstElementChild.style.getPropertyValue("left")) / (BDFDB.DOMUtils.getRects(ele.firstElementChild).width - BDFDB.DOMUtils.getRects(ele).width);
w = isNaN(w) || !isFinite(w) ? p : w; w = isNaN(w) || !isFinite(w) ? p : w;
w *= BDFDB.DOMUtils.getRects(inner).width / (BDFDB.DOMUtils.getRects(ele).width * 2); w *= BDFDB.DOMUtils.getRects(ele.firstElementChild).width / (BDFDB.DOMUtils.getRects(ele).width * 2);
LibraryModules.AnimationUtils.parallel([LibraryModules.AnimationUtils.timing(Animation, {toValue:p, duration:Math.sqrt(w**2) * 4000 / (parseInt(this.props.speed) || 1)})]).start(); LibraryModules.AnimationUtils.parallel([LibraryModules.AnimationUtils.timing(Animation, {toValue:p, duration:Math.sqrt(w**2) * 4000 / (parseInt(this.props.speed) || 1)})]).start();
} }
} }

2
Plugins/BDFDB.min.js vendored
View File

File diff suppressed because one or more lines are too long