tamius-han/ultrawidify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed panning for real, added option to reverse mouse settings.

Browse Source
This commit is contained in:
Tamius Han 2018-12-03 00:31:28 +01:00
parent 5043190441
commit e43d39a8fd
4 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/conf/ExtensionConf.js
View File

@ -102,11 +102,12 @@ var ExtensionConf = {
maxLogZoom: 3,
announceDebounce: 200 // we wait this long before announcing new zoom
},
miscFullscreenSettings: {
miscSettings: {
videoFloat: "center",
mousePan: {
enabled: false
},
mousePanReverseMouse: false,
defaultAr: "original",
},
stretch: {

4
js/lib/Settings.js
View File

@ -344,7 +344,7 @@ class Settings {
if (site.defaultAr) {
return site.defaultAr;
}
return this.active.miscFullscreenSettings.defaultAr;
return this.active.miscSettings.defaultAr;
}
getDefaultStretchMode(site) {
@ -362,6 +362,6 @@ class Settings {
if (site.videoAlignment) {
return site.videoAlignment;
}
return this.active.miscFullscreenSettings.videoFloat;
return this.active.miscSettings.videoFloat;
}
}

31
js/modules/Resizer.js
View File

@ -35,8 +35,8 @@ if(Debug.debug)
this.resizerId = (Math.random(99)*100).toFixed(0);
if (this.settings.active.pan) {
console.log("can pan:", this.settings.active.miscFullscreenSettings.mousePan.enabled, "(default:", this.settings.active.miscFullscreenSettings.mousePan.enabled, ")")
this.canPan = this.settings.active.miscFullscreenSettings.mousePan.enabled;
console.log("can pan:", this.settings.active.miscSettings.mousePan.enabled, "(default:", this.settings.active.miscSettings.mousePan.enabled, ")")
this.canPan = this.settings.active.miscSettings.mousePan.enabled;
} else {
this.canPan = false;
}
@ -181,9 +181,13 @@ if(Debug.debug)
this.pan = {};
}
this.pan.relativeOffsetX = -(relativeMousePosX * 1.1) + 0.55;
this.pan.relativeOffsetY = -(relativeMousePosY * 1.1) + 0.55;
if (this.settings.active.miscSettings.mousePanReverseMouse) {
this.pan.relativeOffsetX = (relativeMousePosX * 1.1) - 0.55;
this.pan.relativeOffsetY = (relativeMousePosY * 1.1) - 0.55;
} else {
this.pan.relativeOffsetX = -(relativeMousePosX * 1.1) + 0.55;
this.pan.relativeOffsetY = -(relativeMousePosY * 1.1) + 0.55;
}
// if(Debug.debug){
// console.log("[Resizer::setPan] relative cursor pos:", relativeMousePosX, ",",relativeMousePosY, " | new pan obj:", this.pan)
// }
@ -311,14 +315,15 @@ if(Debug.debug)
computeOffsets(stretchFactors){
if (Debug.debug) {
console.log("[Resizer::_res_computeOffsets] <rid:"+this.resizerId+"> video will be aligned to ", this.settings.active.miscFullscreenSettings.videoFloat);
console.log("[Resizer::_res_computeOffsets] <rid:"+this.resizerId+"> video will be aligned to ", this.settings.active.miscSettings.videoFloat);
}
const wdiff = this.conf.player.dimensions.width - this.conf.video.offsetWidth;
const hdiff = this.conf.player.dimensions.height - this.conf.video.offsetHeight;
const wdiffAfterzoom = this.conf.video.offsetWidth * stretchFactors.xFactor - this.conf.player.dimensions.width;
const wdiffAfterZoom = this.conf.video.offsetWidth * stretchFactors.xFactor - this.conf.player.dimensions.width;
const hdiffAfterZoom = this.conf.video.offsetHeight * stretchFactors.yFactor - this.conf.player.dimensions.height;
var translate = {
x: wdiff * 0.5,
y: hdiff * 0.5,
@ -326,17 +331,17 @@ if(Debug.debug)
if (this.pan) {
// don't offset when video is smaller than player
if(wdiff < 0 && hdiff < 0) {
if(wdiffAfterZoom < 0 && hdiffAfterZoom < 0) {
return translate;
}
translate.x = wdiff * this.pan.relativeOffsetX * this.zoom.scale;
translate.y = hdiff * this.pan.relativeOffsetY * this.zoom.scale;
translate.x += wdiffAfterZoom * this.pan.relativeOffsetX * this.zoom.scale;
translate.y += hdiffAfterZoom * this.pan.relativeOffsetY * this.zoom.scale;
} else {
if (this.videoFloat == "left") {
translate.x += wdiffAfterzoom * 0.5;
translate.x += wdiffAfterZoom * 0.5;
}
else if (this.videoFloat == "right") {
translate.x -= wdiffAfterzoom * 0.5;
translate.x -= wdiffAfterZoom * 0.5;
}
}

2
res/popup/js/popup.js
View File

@ -286,7 +286,7 @@ function configureGlobalTab() {
processButtonsForPopupCategory(GlobalPanel.elements.alignmentSettings, alignButtons);
selectButton('set-stretch', settings.active.stretch.initialMode, GlobalPanel.elements.stretchSettings.buttons);
selectButton('set-alignment', settings.active.miscFullscreenSettings.videoFloat, GlobalPanel.elements.alignmentSettings.buttons);
selectButton('set-alignment', settings.active.miscSettings.videoFloat, GlobalPanel.elements.alignmentSettings.buttons);
selectButton('set-extension-mode', settings.active.extensionMode, GlobalPanel.elements.extensionSettings.buttons);
selectButton('set-extension-mode', settings.active.arDetect.mode, GlobalPanel.elements.autoarSettings.buttons);