From 959fe3eb8773be66219575ae161e625f03536f69 Mon Sep 17 00:00:00 2001
From: Stanislav Bas <stanislav.m.bas@gmail.com>
Date: Mon, 1 Jun 2015 23:49:40 +0300
Subject: [PATCH] Reset the scrollbar position in the topic list when
 DialogueWindow is closed

---
 apps/openmw/mwgui/dialogue.cpp | 5 +++--
 components/widgets/list.cpp    | 2 +-
 components/widgets/list.hpp    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 48b9be17d..0cb0475c9 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -291,7 +291,10 @@ namespace MWGui
             MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
         }
         else
+        {
             MWBase::Environment::get().getDialogueManager()->goodbyeSelected();
+            mTopicsList->scrollToTop();
+        }
     }
 
     void DialogueWindow::onWindowResize(MyGUI::Window* _sender)
@@ -364,7 +367,6 @@ namespace MWGui
         bool sameActor = (mPtr == actor);
         mPtr = actor;
         mTopicsList->setEnabled(true);
-        mTopicsList->scrollToFirstItem();
         setTitle(npcName);
 
         clearChoices();
@@ -456,7 +458,6 @@ namespace MWGui
             mKeywordSearch.seed(Misc::StringUtils::lowerCase(*it), intptr_t(t));
         }
         mTopicsList->adjustSize();
-        mTopicsList->scrollToFirstItem();
 
         updateHistory();
     }
diff --git a/components/widgets/list.cpp b/components/widgets/list.cpp
index 535a3cad3..db4092b3f 100644
--- a/components/widgets/list.cpp
+++ b/components/widgets/list.cpp
@@ -157,7 +157,7 @@ namespace Gui
         return mScrollView->findWidget (getName() + "_item_" + name)->castType<MyGUI::Button>();
     }
 
-    void MWList::scrollToFirstItem()
+    void MWList::scrollToTop()
     {
         mScrollView->setViewOffset(MyGUI::IntPoint(0, 0));
     }
diff --git a/components/widgets/list.hpp b/components/widgets/list.hpp
index 1c24af6a4..3efe1ff75 100644
--- a/components/widgets/list.hpp
+++ b/components/widgets/list.hpp
@@ -46,7 +46,7 @@ namespace Gui
         MyGUI::Button* getItemWidget(const std::string& name);
         ///< get widget for an item name, useful to set up tooltip
 
-        void scrollToFirstItem();
+        void scrollToTop();
 
         virtual void setPropertyOverride(const std::string& _key, const std::string& _value);