From 0fe2454575ff145af15db45a4a73709aab4618d1 Mon Sep 17 00:00:00 2001
From: "enndeakin%sympatico.ca" <enndeakin%sympatico.ca>
Date: Mon, 17 Sep 2007 15:31:45 +0000
Subject: [PATCH] Bug 396348, colorpicker loses focus when keyboard is used to
 open it, r=mano, a=bz

---
 toolkit/content/widgets/colorpicker.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/toolkit/content/widgets/colorpicker.xml b/toolkit/content/widgets/colorpicker.xml
index d434c7bcda7..863b2c61078 100644
--- a/toolkit/content/widgets/colorpicker.xml
+++ b/toolkit/content/widgets/colorpicker.xml
@@ -430,7 +430,8 @@
     <content>
       <xul:hbox class="colorpicker-button-colorbox" anonid="colorbox" flex="1" xbl:inherits="disabled"/>
 
-      <xul:panel class="colorpicker-button-menupopup" anonid="colorpopup"
+      <xul:panel class="colorpicker-button-menupopup"
+                 anonid="colorpopup" noautofocus="true"
                  onmousedown="event.stopPropagation()"
                  onpopupshowing="this._colorPicker.onPopupShowing()"
                  onpopuphiding="this._colorPicker.onPopupHiding()"