# HG changeset patch
# User Torsten <ttl@justmail.de>
# Date 1444986206 -7200
# Node ID 802dc52d4d469d38250acb6eb88e78e105a895cf
# Parent  ffc6cdcd02c5dfb3b1c7d070e0e0c72ac4040248
improve focus detection of gui (bug #45306)

* file-editor-tab.cc (file-editor-tab.cc): set focus proxy to edit area

* file-editor.cc (enable_menu_shortcuts): explicitly set focus to editor

* octave-dock-widget.cc (octave_dock_widget): strong focus policy for all dock
  widgets

* terminal-dock-widget.cc (terminal_dock_widget): focus policy already set in
  octave_dock_widget

diff -r ffc6cdcd02c5 -r 802dc52d4d46 libgui/src/m-editor/file-editor-tab.cc
--- a/libgui/src/m-editor/file-editor-tab.cc	Sat Oct 10 16:46:00 2015 -0700
+++ b/libgui/src/m-editor/file-editor-tab.cc	Fri Oct 16 11:03:26 2015 +0200
@@ -162,6 +162,8 @@
   QSettings *settings = resource_manager::get_settings ();
   if (settings)
     notice_settings (settings, true);
+
+  setFocusProxy (_edit_area);
 }
 
 file_editor_tab::~file_editor_tab (void)
diff -r ffc6cdcd02c5 -r 802dc52d4d46 libgui/src/m-editor/file-editor.cc
--- a/libgui/src/m-editor/file-editor.cc	Sat Oct 10 16:46:00 2015 -0700
+++ b/libgui/src/m-editor/file-editor.cc	Fri Oct 16 11:03:26 2015 +0200
@@ -1222,6 +1222,9 @@
      i.key ()->setTitle (i.value ().at (! enable));
      ++i;
    }
+
+  if (enable)
+    focus ();
 }
 
 QMenu*
diff -r ffc6cdcd02c5 -r 802dc52d4d46 libgui/src/octave-dock-widget.cc
--- a/libgui/src/octave-dock-widget.cc	Sat Oct 10 16:46:00 2015 -0700
+++ b/libgui/src/octave-dock-widget.cc	Fri Oct 16 11:03:26 2015 +0200
@@ -124,6 +124,7 @@
 
   installEventFilter (this);
 
+  setFocusPolicy (Qt::StrongFocus);
 }
 
 octave_dock_widget::~octave_dock_widget ()
diff -r ffc6cdcd02c5 -r 802dc52d4d46 libgui/src/terminal-dock-widget.cc
--- a/libgui/src/terminal-dock-widget.cc	Sat Oct 10 16:46:00 2015 -0700
+++ b/libgui/src/terminal-dock-widget.cc	Fri Oct 16 11:03:26 2015 +0200
@@ -39,7 +39,6 @@
 
   setWidget (terminal);
   setFocusProxy (terminal);
-  setFocusPolicy (Qt::StrongFocus);
 
   connect (terminal, SIGNAL (interrupt_signal (void)),
            this, SLOT (terminal_interrupt ()));