From 7ebbd67f7773889af98f8d9a0a64a9d336c7db53 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Fri, 13 Jul 2018 17:05:44 +0000 Subject: [PATCH] f18.js: slight padding fixes (Forum #82351) git-svn-id: https://svn.fhem.de/fhem/trunk@16978 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/www/pgm2/f18.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fhem/www/pgm2/f18.js b/fhem/www/pgm2/f18.js index 23f493a7f..e15a4695e 100644 --- a/fhem/www/pgm2/f18.js +++ b/fhem/www/pgm2/f18.js @@ -460,7 +460,7 @@ f18_addDragger(el) f18_convertToAbs(); var ep = $(el).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]; if(f18_getAttr("snapToGrid")) @@ -485,7 +485,7 @@ f18_addDragger(el) "background-image":"url('"+f18_icon.arrows+"')"}) $(el).draggable({ 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 }); }, stop:save, grid:grid @@ -502,7 +502,7 @@ f18_addDragger(el) top:$(comp).height()+2, left:$(comp).width()-off, "z-index":1 }) .draggable({ 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, height:ui.position.top }); }, @@ -622,12 +622,12 @@ f18_doSetPos(el, comp, pos) f18_applyGrid(pos); $(el).css({ position:"absolute", left:pos.left, top:pos.top }); 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 }); } $(comp).css({ position:"absolute", - left:pos.left+pos.oLeft, top:pos.top+pos.oTop, - width:pos.width, height:pos.height }); + left:pos.left+pos.oLeft, top:pos.top+pos.oTop, + width:pos.width, height:pos.height }); }