From db652ef84f4d2f9fa1aed51af42fc8d4bdfd674f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gon=C3=A7alo=20Silva?= <goncalossilva@gmail.com>
Date: Sat, 27 Apr 2019 04:17:45 +0100
Subject: [PATCH] Ensure text view is focused when toggling preview

Consistent with other menu options.
---
 uberwriter/main_window.py | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/uberwriter/main_window.py b/uberwriter/main_window.py
index 794033c..460374c 100644
--- a/uberwriter/main_window.py
+++ b/uberwriter/main_window.py
@@ -173,19 +173,16 @@ class MainWindow(StyledWindow):
         if state.get_boolean():
             self.fullscreen()
             self.fs_headerbar.events.show()
-
         else:
             self.unfullscreen()
             self.fs_headerbar.events.hide()
-
         self.text_view.grab_focus()
 
     def set_focus_mode(self, state):
         """toggle focusmode
         """
 
-        focus_mode = state.get_boolean()
-        self.text_view.set_focus_mode(focus_mode)
+        self.text_view.set_focus_mode(state.get_boolean())
         self.text_view.grab_focus()
 
     def set_hemingway_mode(self, state):
@@ -195,6 +192,22 @@ class MainWindow(StyledWindow):
         self.text_view.set_hemingway_mode(state.get_boolean())
         self.text_view.grab_focus()
 
+    def toggle_preview(self, state):
+        """Toggle the preview mode
+
+        Arguments:
+            state {gtk bool} -- Desired state of the preview mode (enabled/disabled)
+        """
+
+        if state.get_boolean():
+            self.text_view.grab_focus()
+            self.preview_handler.show()
+        else:
+            self.preview_handler.hide()
+            self.text_view.grab_focus()
+
+        return True
+
     # TODO: refactorizable
     def save_document(self, _widget=None, _data=None):
         """provide to the user a filechooser and save the document
@@ -420,20 +433,6 @@ class MainWindow(StyledWindow):
         elif self.overlay_id:
             self.scrolled_window.disconnect(self.overlay_id)
 
-    def toggle_preview(self, state):
-        """Toggle the preview mode
-
-        Arguments:
-            state {gtk bool} -- Desired state of the preview mode (enabled/disabled)
-        """
-
-        if state.get_boolean():
-            self.preview_handler.show()
-        else:
-            self.preview_handler.hide()
-
-        return True
-
     def reload_preview(self):
         self.preview_handler.reload()