From 3fcfebf112fe7c8a810de31a358a6b6e2f2326a5 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Fri, 23 Jun 2006 15:08:00 -0400
Subject: [PATCH] Fix chat focus

---
 sugar/chat/ChatToolbar.py       | 1 +
 sugar/chat/richtext.py          | 4 ++++
 sugar/chat/sketchpad/Toolbox.py | 5 +++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sugar/chat/ChatToolbar.py b/sugar/chat/ChatToolbar.py
index 3e33c0c1..d69cc55d 100644
--- a/sugar/chat/ChatToolbar.py
+++ b/sugar/chat/ChatToolbar.py
@@ -22,6 +22,7 @@ class ChatToolbar(gtk.HBox):
 		toolbox.show()
 		
 		item = gtk.Button()
+		item.unset_flags(gtk.CAN_FOCUS)
 
 		e_hbox = gtk.HBox(False, 6)
 		
diff --git a/sugar/chat/richtext.py b/sugar/chat/richtext.py
index 688b41a3..9a5fe04b 100644
--- a/sugar/chat/richtext.py
+++ b/sugar/chat/richtext.py
@@ -166,6 +166,7 @@ class RichTextToolbox(gtk.HBox):
 		item = gtk.ToggleButton()
 		item.set_image(image)
 		item.connect("toggled", self.__toggle_style_cb, "bold")
+		item.unset_flags(gtk.CAN_FOCUS)
 		self.pack_start(item, False)
 		item.show()
 
@@ -176,6 +177,7 @@ class RichTextToolbox(gtk.HBox):
 
 		item = gtk.ToggleButton()
 		item.set_image(image)
+		item.unset_flags(gtk.CAN_FOCUS)
 		item.connect("toggled", self.__toggle_style_cb, "italic")
 		self.pack_start(item, False)
 		item.show()
@@ -185,6 +187,7 @@ class RichTextToolbox(gtk.HBox):
 
 		self._font_size_up = gtk.Button()
 		self._font_size_up.set_image(image)
+		self._font_size_up.unset_flags(gtk.CAN_FOCUS)
 		self._font_size_up.connect("clicked", self.__font_size_up_cb)
 		self.pack_start(self._font_size_up, False)
 		self._font_size_up.show()
@@ -196,6 +199,7 @@ class RichTextToolbox(gtk.HBox):
 
 		self._font_size_down = gtk.Button()
 		self._font_size_down.set_image(image)
+		self._font_size_down.unset_flags(gtk.CAN_FOCUS)
 		self._font_size_down.connect("clicked", self.__font_size_down_cb)
 		self.pack_start(self._font_size_down, False)
 		self._font_size_down.show()
diff --git a/sugar/chat/sketchpad/Toolbox.py b/sugar/chat/sketchpad/Toolbox.py
index 9428e421..0b0605ac 100644
--- a/sugar/chat/sketchpad/Toolbox.py
+++ b/sugar/chat/sketchpad/Toolbox.py
@@ -14,7 +14,7 @@ class ColorButton(gtk.RadioButton):
 		
 		drawing_area = gtk.DrawingArea()
 		drawing_area.set_size_request(24, 24)
-		drawing_area.connect('expose_event', self.expose)
+		drawing_area.connect_after('expose_event', self.expose)
 		self.add(drawing_area)
 		drawing_area.show()
 
@@ -26,7 +26,7 @@ class ColorButton(gtk.RadioButton):
 		ctx = widget.window.cairo_create()
 
 		ctx.set_source_rgb(self._rgb[0], self._rgb[1] , self._rgb[2])
-		ctx.rectangle(0, 0, rect.width, rect.height)
+		ctx.rectangle(4, 4, rect.width - 8, rect.height - 8)
 		ctx.fill()
 		
 		return False
@@ -49,6 +49,7 @@ class Toolbox(gtk.HBox):
 				
 	def _add_color(self, rgb):
 		color = ColorButton(self._colors_group, rgb)
+		color.unset_flags(gtk.CAN_FOCUS)
 		color.connect('clicked', self.__color_clicked_cb, rgb)
 		self.pack_start(color, False)