Fix SymbolObject get_bounds.

2 files changed, 18 insertions, 15 deletions

diff --git a/symbolmovableobject.py b/symbolmovableobject.py
index 430ecb9..e2977f6 100644
--- a/symbolmovableobject.py
+++ b/symbolmovableobject.py
@@ -37,8 +37,9 @@ class SymbolMovableObject(MovableObject):
         self.symbol = symbol

         self.size = size

         

-        self.width = 0

-        self.height = 0

+        # Assume massive width and height until set by draw.

+        self.width = 10000 

+        self.height = 10000

         

         self.selectable = True

         self.rotatable = False

@@ -74,11 +75,12 @@ class SymbolMovableObject(MovableObject):
             cr.move_to(self.pos.x - x_bearing - width/2, self.pos.y - y_bearing - height/2) 

             cr.show_text(text)

            

+        if self.use_minimum_width_and_height:

+            width = 75

+            height = 75

+

         if self.selected:

-            if self.use_minimum_width_and_height:

-                self.width = 75

-                self.height = 75

-            cr.rectangle(self.pos.x - 5 - width/2, self.pos.y - 5 - height/2, self.width + 10, self.height + 10)    

+            cr.rectangle(self.pos.x - 5 - width/2, self.pos.y - 5 - height/2, width + 10, height + 10)    

             cr.set_line_width(1.0)

             # Draw a different dashed outline if the object is not only selected but dragged.

             if self.dragged:

@@ -113,6 +115,5 @@ class SymbolMovableObject(MovableObject):
         self.queue_draw()

 

     def get_bounds(self):

-        hsz = Vector(self.width/2, self.height/2)

+        hsz = Vector(self.width/2 + 5, self.height/2 + 5)

         return self.pos - hsz, self.pos + hsz

-        return self.pos - Vector(25, 0), self.pos + Vector(25, self.length)

diff --git a/symbolobject.py b/symbolobject.py
index 6150fe9..15005e7 100644
--- a/symbolobject.py
+++ b/symbolobject.py
@@ -38,8 +38,9 @@ class SymbolObject(DraggableObject):
         

         self.symbol_visible = True

         

-        self.width = 0

-        self.height = 0

+        # Assume massive width and height until set by draw.

+        self.width = 10000 

+        self.height = 10000

         

         self.selectable = True

         self.rotatable = False

@@ -77,11 +78,12 @@ class SymbolObject(DraggableObject):
             if self.symbol_visible:

                 cr.show_text(text)

            

+        if self.use_minimum_width_and_height:

+            width = 75

+            height = 75

+

         if self.selected:

-            if self.use_minimum_width_and_height:

-                self.width = 75

-                self.height = 75

-            cr.rectangle(self.pos.x - 5 - width/2, self.pos.y - 5 - height/2, self.width + 10, self.height + 10)    

+            cr.rectangle(self.pos.x - 5 - width/2, self.pos.y - 5 - height/2, width + 10, height + 10)    

             cr.set_line_width(1.0)

             # Draw a different dashed outline if the object is not only selected but dragged.

             if self.dragged:   

@@ -116,5 +118,5 @@ class SymbolObject(DraggableObject):
         self.queue_draw()

     

     def get_bounds(self):

-        hsz = Vector(self.width/2, self.height/2)   

+        hsz = Vector(self.width/2 + 5, self.height/2 + 5)   

         return self.pos - hsz, self.pos + hsz