# HG changeset patch
# User wenzelm
# Date 1399662224 -7200
# Node ID 9ecf2cbfc80db98c3f75462f119dd9ca9f4f7b1f
# Parent  42b5d216dc8cc2b3b5071fb1235cdddbb0f86a8e
always bounce focus back to main text area, unless explicit focus component is given here (see also 7b65f4da136d);

diff -r 42b5d216dc8c -r 9ecf2cbfc80d src/Tools/jEdit/src/dockable.scala
--- a/src/Tools/jEdit/src/dockable.scala	Fri May 09 21:02:15 2014 +0200
+++ b/src/Tools/jEdit/src/dockable.scala	Fri May 09 21:03:44 2014 +0200
@@ -22,7 +22,7 @@
   if (position == DockableWindowManager.FLOATING)
     setPreferredSize(new Dimension(500, 250))
 
-  def focusOnDefaultComponent { requestFocus }
+  def focusOnDefaultComponent { JEdit_Lib.request_focus_view(view) }
 
   def set_content(c: Component) { add(c, BorderLayout.CENTER) }
   def set_content(c: scala.swing.Component) { add(c.peer, BorderLayout.CENTER) }
diff -r 42b5d216dc8c -r 9ecf2cbfc80d src/Tools/jEdit/src/output_dockable.scala
--- a/src/Tools/jEdit/src/output_dockable.scala	Fri May 09 21:02:15 2014 +0200
+++ b/src/Tools/jEdit/src/output_dockable.scala	Fri May 09 21:03:44 2014 +0200
@@ -20,9 +20,6 @@
 
 class Output_Dockable(view: View, position: String) extends Dockable(view, position)
 {
-  override def focusOnDefaultComponent { view.getTextArea.requestFocus }
-
-
   /* component state -- owned by Swing thread */
 
   private var zoom_factor = 100