diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-10-25 14:09:04 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-10-25 14:09:04 -0700 |
| commit | 66df227f72156ddbc3f8b9321ff507a4e8a91523 (patch) | |
| tree | 8fbcf4438b59d3fbb329f360837227a6ffa9400b /grc/gui/Block.py | |
| parent | a411404005f3c24c8df51b68946e2cfd69e38d63 (diff) | |
| parent | a4514d5c172b2631b856d7bd543c491a02a5c553 (diff) | |
Merge branch 'maint'
Diffstat (limited to 'grc/gui/Block.py')
| -rw-r--r-- | grc/gui/Block.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/grc/gui/Block.py b/grc/gui/Block.py index 39c6993a37..b9fc12b782 100644 --- a/grc/gui/Block.py +++ b/grc/gui/Block.py @@ -95,8 +95,9 @@ class Block(Element, _Block): """ proximity = Constants.BORDER_PROXIMITY_SENSITIVITY try: #should evaluate to tuple - x, y = Utils.scale(eval(self.get_param('_coordinate').get_value())) - fgW, fgH = self.get_parent().get_size() + coor = eval(self.get_param('_coordinate').get_value()) + x, y = map(int, coor) + fgW,fgH = self.get_parent().get_size() if x <= 0: x = 0 elif x >= fgW - proximity: @@ -123,7 +124,7 @@ class Block(Element, _Block): Utils.align_to_grid(coor[0] + offset_x) - offset_x, Utils.align_to_grid(coor[1] + offset_y) - offset_y ) - self.get_param('_coordinate').set_value(str(Utils.scale(coor, reverse=True))) + self.get_param('_coordinate').set_value(str(coor)) def bound_move_delta(self, delta_coor): """ @@ -140,11 +141,11 @@ class Block(Element, _Block): try: fgW, fgH = self.get_parent().get_size() - x, y = Utils.scale(eval(self.get_param('_coordinate').get_value())) + x, y = map(int, eval(self.get_param("_coordinate").get_value())) if self.is_horizontal(): - sW, sH = self.W, self.H + sW, sH = self.W, self.H else: - sW, sH = self.H, self.W + sW, sH = self.H, self.W if x + dX < 0: dX = -x @@ -153,7 +154,7 @@ class Block(Element, _Block): if y + dY < 0: dY = -y elif dY + y + sH >= fgH: - dY = fgH - y - sH + dY = fgH - y - sH except: pass |