Merge pull request #1634 from janezd/focus-adjustments

Focus adjustments
biolab · Oct 7, 2016 · 97863cf · 97863cf
2 parents 3668622 + 63355d2
commit 97863cf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/Orange/widgets/gui.py b/Orange/widgets/gui.py
@@ -787,6 +787,7 @@ def __textEdited(self):
         self.__changed = True
 
     def returnPressedHandler(self):
+        self.clearFocus()
         if self.__changed:
             self.__changed = False
             if hasattr(self, "cback") and self.cback:

diff --git a/Orange/widgets/widget.py b/Orange/widgets/widget.py
@@ -205,6 +205,9 @@ def __new__(cls, *args, captionTitle=None, **kwargs):
 
         sc = QShortcut(QKeySequence.Copy, self)
         sc.activated.connect(self.copy_to_clipboard)
+        if self.controlArea is not None:
+            # Otherwise, the first control has focus
+            self.controlArea.setFocus(Qt.ActiveWindowFocusReason)
         return self
 
     # pylint: disable=super-init-not-called