# HG changeset patch
# User wenzelm
# Date 1377629933 -7200
# Node ID ea4abbbe1702b66fe7f9f216ea486d241d2e342d
# Parent  4b422e5d64fdcbb3d284b7289a61f093bccc28f4
more careful refocus operation: do not reset focus if it was already lost (relevant when activating a different GUI component, for example);

diff -r 4b422e5d64fd -r ea4abbbe1702 src/Tools/jEdit/src/completion_popup.scala
--- a/src/Tools/jEdit/src/completion_popup.scala	Tue Aug 27 20:45:02 2013 +0200
+++ b/src/Tools/jEdit/src/completion_popup.scala	Tue Aug 27 20:58:53 2013 +0200
@@ -89,7 +89,7 @@
                 new Completion_Popup(view.getRootPane, popup_font, location, items) {
                   override def complete(item: Item) { complete_item(text_area, item) }
                   override def propagate(evt: KeyEvent) { JEdit_Lib.propagate_key(view, evt) }
-                  override def hidden() { text_area.requestFocus }
+                  override def refocus() { text_area.requestFocus }
                 }
               }
           }
@@ -115,7 +115,7 @@
 
   def complete(item: Completion_Popup.Item) { }
   def propagate(evt: KeyEvent) { }
-  def hidden() { }
+  def refocus() { }
 
 
   /* list view */
@@ -240,8 +240,9 @@
 
   private def hide_popup()
   {
+    val had_focus = list_view.peer.isFocusOwner
     popup.hide
-    hidden()
+    if (had_focus) refocus()
   }
 
   popup.show