Bug #2147 fixed.

description: Text boxes get stuck in canvas on Oficina.

3 files changed, 16 insertions, 5 deletions

diff --git a/Area.py b/Area.py
index b9b0131..1f1984a 100644
--- a/Area.py
+++ b/Area.py
@@ -252,10 +252,16 @@ class Area(gtk.DrawingArea):
         width, height = self.window.get_size()
         # text
         coords = int(event.x), int(event.y)
-        if self.tool == 'text':
+        if self.tool is 'text':
             self.d.text(widget,event)
-#         else:
-#             self.janela._textview.hide()
+            
+        # This fixes a bug that made the text viewer get stuck in the canvas
+        elif self.estadoTexto is 1:
+            text = self.janela._textview.get_text()
+            if text is not None:
+                self.d.text(widget,event)
+            self.estadoTexto = 0
+            self.janela._textview.hide()
             
         if not self.selmove or self.tool != 'marquee-rectangular':
             self.oldx = int(event.x)
diff --git a/Desenho.py b/Desenho.py
index cdc43c9..efc6dd8 100644
--- a/Desenho.py
+++ b/Desenho.py
@@ -518,13 +518,16 @@ class Desenho:
         event -- GdkEvent
 
         """
+        #print self.d.estadoTexto
         if self.d.estadoTexto == 0:
             self.d.estadoTexto = 1
-            print event.x
+            
             self.d.janela._fixed.move(self.d.janela._textview, int(event.x)+200, int(event.y)+100)
             # Area size has changed...
             #self.d.janela._fixed.move(self.d.janela._textview, int(event.x), int(event.y))
             self.d.janela._textview.show()
+            self.d.janela._textview.grab_focus()
+            
         else:   
             self.d.estadoTexto = 0  
             texto = self.d.janela._textview.get_text()
@@ -538,7 +541,8 @@ class Desenho:
             self.d.enableUndo(widget)
             
             widget.queue_draw()
-
+            
+        #print self.d.estadoTexto
 
     def selection(self, widget, coords, temp, fill):
         """Make a selection.
diff --git a/NEWS b/NEWS
index 9aacd25..3545488 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
 7
 
+* Bug #2147 fixed (alexandre)
 * Build as Paint not oficina
 * Clean up NEWS file - please use setup.py release to do releases