FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-16 16:56:04 +00:00
Code Issues Releases Wiki Activity

f18.js: slight padding fixes (Forum #82351)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@16978 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2018-07-13 17:05:44 +00:00
parent 2b29609ef7
commit 7ebbd67f77
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fhem/www/pgm2/f18.js
View File

@ -460,7 +460,7 @@ f18_addDragger(el)
f18_convertToAbs(); f18_convertToAbs();
var ep = $(el).position(); var ep = $(el).position();
var cp = $(comp).position(); var cp = $(comp).position();
var padding = $(el).css("padding").replace("px","")*2; // kind of a hack var pl = parseInt($(el).css("padding-left").replace("px",""));
var grid = [1,1]; var grid = [1,1];
if(f18_getAttr("snapToGrid")) if(f18_getAttr("snapToGrid"))
@ -485,7 +485,7 @@ f18_addDragger(el)
"background-image":"url('"+f18_icon.arrows+"')"}) "background-image":"url('"+f18_icon.arrows+"')"})
$(el).draggable({ $(el).draggable({
drag:function(evt,ui){ drag:function(evt,ui){
$(comp).css({ left:ui.position.left+cp.left-ep.left, $(comp).css({ left:ui.position.left+cp.left-ep.left,
top: ui.position.top +cp.top -ep.top }); top: ui.position.top +cp.top -ep.top });
}, },
stop:save, grid:grid stop:save, grid:grid
@ -502,7 +502,7 @@ f18_addDragger(el)
top:$(comp).height()+2, left:$(comp).width()-off, "z-index":1 }) top:$(comp).height()+2, left:$(comp).width()-off, "z-index":1 })
.draggable({ .draggable({
drag:function(evt,ui){ drag:function(evt,ui){
$(el).css( { width:ui.position.left+off-padding }); $(el).css( { width:ui.position.left+off });
$(comp).css({ width:ui.position.left+off, $(comp).css({ width:ui.position.left+off,
height:ui.position.top }); height:ui.position.top });
}, },
@ -622,12 +622,12 @@ f18_doSetPos(el, comp, pos)
f18_applyGrid(pos); f18_applyGrid(pos);
$(el).css({ position:"absolute", left:pos.left, top:pos.top }); $(el).css({ position:"absolute", left:pos.left, top:pos.top });
if(!$(el).hasClass("SVGlabel")) { if(!$(el).hasClass("SVGlabel")) {
var padding = $(el).css("padding").replace("px","")*2; // kind of a hack var padding = parseInt($(el).css("padding-left").replace("px",""));
$(el).css({ width:pos.width-padding }); $(el).css({ width:pos.width-padding });
} }
$(comp).css({ position:"absolute", $(comp).css({ position:"absolute",
left:pos.left+pos.oLeft, top:pos.top+pos.oTop, left:pos.left+pos.oLeft, top:pos.top+pos.oTop,
width:pos.width, height:pos.height }); width:pos.width, height:pos.height });
} }