m/quickdial-webext
1
0
Fork 0
mirror of https://github.com/MatMoul/quickdial-webext.git synced 2024-12-23 07:26:11 +00:00
Code Releases Activity

Improvement: Tile and snapshot relative to grid size

Browse Source
This commit is contained in:
MatMoul 2017-11-18 00:06:49 +01:00
parent 7b0ac506d8
commit a9a4212299
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/js/background.js
View File

@ -296,7 +296,8 @@ app.SiteInfos.fromNewTab = function(url, callback){ // Retrieve infos from a ne
imgObj.src = img; imgObj.src = img;
var previewWidth = 1200; // Need to be linked to settings var previewWidth = 1200; // Need to be linked to settings
var previewHeight = 710; // Need to be linked to settings var previewHeight = previewWidth / app.settings.grid.columns * app.settings.grid.rows;
if(app.settings.grid.title == true) previewHeight -= app.settings.grid.titleHeight;
var canvas = document.createElement('canvas'); var canvas = document.createElement('canvas');
canvas.style.width = previewWidth.toString() + 'px'; canvas.style.width = previewWidth.toString() + 'px';
@ -362,7 +363,8 @@ app.SiteInfos.fromFrame = function(url, callback){ // Retrieve infos from an ifr
} }
var previewWidth = 1200; // Need to be linked to settings var previewWidth = 1200; // Need to be linked to settings
var previewHeight = 710; // Need to be linked to settings var previewHeight = previewWidth / app.settings.grid.columns * app.settings.grid.rows;
if(app.settings.grid.title == true) previewHeight -= app.settings.grid.titleHeight;
var iframe; var iframe;
var xmlHttp = new XMLHttpRequest(); var xmlHttp = new XMLHttpRequest();
xmlHttp.timeout = 10000 xmlHttp.timeout = 10000
@ -372,7 +374,7 @@ app.SiteInfos.fromFrame = function(url, callback){ // Retrieve infos from an ifr
iframe.width = previewWidth iframe.width = previewWidth
iframe.height = previewHeight iframe.height = previewHeight
iframe.style.position = 'absolute'; iframe.style.position = 'absolute';
//iframe.style.visibility = 'hidden'; iframe.scrolling = 'no';
var content = xmlHttp.responseText.replace('<head>', '<head><base href="' + url + '">'); var content = xmlHttp.responseText.replace('<head>', '<head><base href="' + url + '">');
iframe.onload = function(){ pageLoaded(); } iframe.onload = function(){ pageLoaded(); }
document.body.appendChild(iframe); document.body.appendChild(iframe);

4
src/js/dial.js
View File

@ -415,8 +415,8 @@ dial.updateGridLayout = function(){
var cellHeight = fullHeight / app.settings.grid.rows; var cellHeight = fullHeight / app.settings.grid.rows;
var linkWidth = 0; var linkWidth = 0;
var linkHeight = 0; var linkHeight = 0;
if(cellWidth <= cellHeight * 4 / 3) cellHeight = cellWidth / 4 * 3; if(cellWidth <= cellHeight * app.settings.grid.columns / app.settings.grid.rows) cellHeight = cellWidth / app.settings.grid.columns * app.settings.grid.rows;
else cellWidth = cellHeight / 3 * 4; else cellWidth = cellHeight / app.settings.grid.rows * app.settings.grid.columns;
linkWidth = cellWidth - 2 * (cellsMargin + 1) - 2 * borderSize; linkWidth = cellWidth - 2 * (cellsMargin + 1) - 2 * borderSize;
linkHeight = cellHeight - 2 * (cellsMargin + 1) - 2 * borderSize - titleBorderSize; linkHeight = cellHeight - 2 * (cellsMargin + 1) - 2 * borderSize - titleBorderSize;
return { return {