From 2514cc5cc8162e24b299ea9690562475bda57f42 Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Tue, 26 Sep 2017 18:20:24 +0200
Subject: [PATCH] Workaround key focus being reset in BookWindow when next/prev
 are hidden

---
 apps/openmw/mwgui/bookwindow.cpp | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/apps/openmw/mwgui/bookwindow.cpp b/apps/openmw/mwgui/bookwindow.cpp
index ae20b8e43..a86146f2f 100644
--- a/apps/openmw/mwgui/bookwindow.cpp
+++ b/apps/openmw/mwgui/bookwindow.cpp
@@ -1,6 +1,7 @@
 #include "bookwindow.hpp"
 
 #include <MyGUI_TextBox.h>
+#include <MyGUI_InputManager.h>
 
 #include <components/esm/loadbook.hpp>
 
@@ -153,20 +154,16 @@ namespace MWGui
         mLeftPageNumber->setCaption( MyGUI::utility::toString(mCurrentPage*2 + 1) );
         mRightPageNumber->setCaption( MyGUI::utility::toString(mCurrentPage*2 + 2) );
 
-        //If it is the last page, hide the button "Next Page"
-        if (   (mCurrentPage+1)*2 == mPages.size()
-            || (mCurrentPage+1)*2 == mPages.size() + 1)
-        {
-            mNextPageButton->setVisible(false);
-        } else {
-            mNextPageButton->setVisible(true);
-        }
-        //If it is the fist page, hide the button "Prev Page"
-        if (mCurrentPage == 0) {
-            mPrevPageButton->setVisible(false);
-        } else {
-            mPrevPageButton->setVisible(true);
-        }
+        MyGUI::Widget* focus = MyGUI::InputManager::getInstance().getKeyFocusWidget();
+        bool nextPageVisible = (mCurrentPage+1)*2 < mPages.size();
+        mNextPageButton->setVisible(nextPageVisible);
+        bool prevPageVisible = mCurrentPage != 0;
+        mPrevPageButton->setVisible(prevPageVisible);
+
+        if (focus == mNextPageButton && !nextPageVisible && prevPageVisible)
+            MyGUI::InputManager::getInstance().setKeyFocusWidget(mPrevPageButton);
+        else if (focus == mPrevPageButton && !prevPageVisible && nextPageVisible)
+            MyGUI::InputManager::getInstance().setKeyFocusWidget(mNextPageButton);
 
         if (mPages.empty())
             return;