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

commands for setting zoom from the popup, zoom is logarithmic/exponential rather than linear

Browse Source
This commit is contained in:
Tamius Han 2018-09-18 23:37:33 +02:00
parent 5e2611f410
commit f265799e3c
5 changed files with 46 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
js/lib/Comms.js
View File

@ -76,7 +76,9 @@ class CommsClient {
} else if (message.cmd === "resume-processing") {
// todo: autoArStatus
this.pageInfo.resumeProcessing(message.autoArStatus);
}
} else if (message.cmd === 'set-zoom') {
this.pageInfo.setZoom(message.zoom);
}
}
async sleep(n){
@ -238,9 +240,6 @@ class CommsServer {
port.postMessage({cmd: "set-config", conf: this.settings.active, site: this.server.currentSite})
} else if (message.cmd === 'set-stretch') {
this.sendToActive(message);
} else if (message.cmd === 'set-stretch-default') {
this.settings.active.stretch.initialMode = message.mode;
this.settings.save();
} else if (message.cmd === 'set-ar') {
this.sendToActive(message);
} else if (message.cmd === 'set-custom-ar') {
@ -248,10 +247,9 @@ class CommsServer {
this.settings.save();
} else if (message.cmd === 'set-video-float') {
this.sendToActive(message);
this.settings.save();
} else if (message.cmd === 'autoar-start') {
this.sendToActive(message);
} else if (message.cmd === "autoar-disable") { // LEGACY - can be removed prolly?
} else if (message.cmd === "autoar-disable") { // LEGACY - can be removed prolly
this.settings.active.arDetect.mode = "disabled";
if(message.reason){
this.settings.active.arDetect.disabledReason = message.reason;
@ -259,47 +257,8 @@ class CommsServer {
this.settings.active.arDetect.disabledReason = 'User disabled';
}
this.settings.save();
} else if (message.cmd === "autoar-set-interval") {
if(Debug.debug)
console.log("[uw-bg] trying to set new interval for autoAr. New interval is",message.timeout,"ms");
// set fairly liberal limit
var timeout = message.timeout < 4 ? 4 : message.timeout;
this.settings.active.arDetect.timer_playing = timeout;
this.settings.save();
} else if (message.cmd === "set-autoar-defaults") {
this.settings.active.arDetect.mode = message.mode;
this.settings.save();
} else if (message.cmd === "set-autoar-for-site") {
if (this.settings.active.sites[this.server.currentSite]) {
this.settings.active.sites[this.server.currentSite].arStatus = message.mode;
this.settings.save();
} else {
this.settings.active.sites[this.server.currentSite] = {
status: "default",
arStatus: message.mode,
statusEmbedded: "default"
};
this.settings.save();
}
} else if (message.cmd === "set-extension-defaults") {
this.settings.active.extensionMode = message.mode;
this.settings.save();
} else if (message.cmd === "set-extension-for-site") {
if (this.settings.active.sites[this.server.currentSite]) {
this.settings.active.sites[this.server.currentSite].status = message.mode;
this.settings.save();
} else {
this.settings.active.sites[this.server.currentSite] = {
status: message.mode,
arStatus: "default",
statusEmbedded: message.mode
};
this.settings.save();
if(Debug.debug) {
console.log("SAVING PER-SITE OPTIONS,", this.server.currentSite, this.settings.active.sites[this.server.currentSite])
}
}
} else if (message.cmd === 'set-zoom') {
this.setToActive(message);
}
}

5
js/lib/VideoData.js
View File

@ -130,8 +130,13 @@ class VideoData {
this.resizer.setStretchMode(stretchMode);
}
setZoom(zoomLevel){
this.resizer.setZoom(zoomLevel);
}
zoomStep(step){
this.resizer.zoomStep(step);
}
}

6
js/modules/PageInfo.js
View File

@ -253,6 +253,12 @@ class PageInfo {
}
}
setZoom(zoomLevel) {
for(var vd of this.videos) {
vd.setZoom(zoomLevel);
}
}
zoomStep(step){
for(var vd of this.videos){
vd.zoomStep(step);

4
js/modules/Resizer.js
View File

@ -264,6 +264,10 @@ class Resizer {
this.pan = undefined;
}
setZoom(zoomLevel) {
this.zoom.setZoom(zoomLevel);
}
zoomStep(step){
this.zoom.zoomStep(step);
}

42
js/modules/Zoom.js
View File

@ -8,9 +8,10 @@ class Zoom {
// functions
constructor(videoData) {
this.scale = 1;
this.logScale = 0;
this.scaleStep = 0.1;
this.minScale = 0.5; // not accurate, actually slightly less
this.maxScale = 8; // not accurate, actually slightly more
this.minScale = -1; // 50% (log2(0.5) = -1)
this.maxScale = 3; // 800% (log2(8) = 3)
this.conf = videoData;
}
@ -19,32 +20,37 @@ class Zoom {
}
zoomIn(){
this.scale += this.scaleStep;
this.logScale += this.scaleStep;
if (this.scale >= this.maxScale) {
this.scale = this.maxScale;
if (this.logScale >= this.maxScale) {
this.logScale = this.maxScale;
}
this.scale = Math.pow(2, this.logScale);
}
zoomOut(){
this.scale -= this.scaleStep;
this.logScale -= this.scaleStep;
if (this.scale <= this.minScale) {
this.scale = this.minScale;
if (this.logScale <= this.minScale) {
this.logScale = this.minScale;
}
this.scale = Math.pow(2, this.logScale);
}
zoomStep(amount){
this.scale += amount;
this.logScale += amount;
if (this.scale <= this.minScale) {
this.scale = this.minScale;
if (this.logScale <= this.minScale) {
this.logScale = this.minScale;
}
if (this.scale >= this.maxScale) {
this.scale = this.maxScale;
if (this.logScale >= this.maxScale) {
this.logScale = this.maxScale;
}
this.scale = Math.pow(2, this.logScale);
if (Debug.debug) {
console.log("[Zoom::zoomStep] changing zoom by", amount, ". New zoom level:", this.scale);
}
@ -54,12 +60,14 @@ class Zoom {
setZoom(scale){
if(scale < this.minScale) {
this.scale = this.minScale;
scale = this.minScale;
} else if (scale > this.maxScale) {
this.scale = this.maxScale;
} else {
this.scale = scale;
scale = this.maxScale;
}
this.scale = Math.pow(2, this.logScale);
this.conf.restoreAr();
}
applyZoom(videoDimensions){