From d9d626cc957c139df9c5fc550e429328d201e930 Mon Sep 17 00:00:00 2001 From: Jan-Peter Nilsson Date: Sat, 6 Nov 2010 11:47:46 +0100 Subject: [PATCH] Make DialogueWindow use the new WindowBase --- apps/openmw/mwgui/dialogue.cpp | 9 ++------- apps/openmw/mwgui/dialogue.hpp | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp index 6f2ca8e96..fe43cabc9 100644 --- a/apps/openmw/mwgui/dialogue.cpp +++ b/apps/openmw/mwgui/dialogue.cpp @@ -17,15 +17,10 @@ using namespace MWGui; using namespace Widgets; DialogueWindow::DialogueWindow(MWWorld::Environment& environment) - : Layout("openmw_dialogue_window_layout.xml") - , environment(environment) + : WindowBase("openmw_dialogue_window_layout.xml", environment) { // Centre dialog - MyGUI::IntSize gameWindowSize = environment.mWindowManager->getGui()->getViewSize(); - MyGUI::IntCoord coord = mMainWidget->getCoord(); - coord.left = (gameWindowSize.width - coord.width)/2; - coord.top = (gameWindowSize.height - coord.height)/2; - mMainWidget->setCoord(coord); + center(); //WindowManager *wm = environment.mWindowManager; setText("NpcName", "Name of character"); diff --git a/apps/openmw/mwgui/dialogue.hpp b/apps/openmw/mwgui/dialogue.hpp index 625ca225d..3e4852203 100644 --- a/apps/openmw/mwgui/dialogue.hpp +++ b/apps/openmw/mwgui/dialogue.hpp @@ -1,10 +1,7 @@ #ifndef MWGUI_DIALOGE_H #define MWGUI_DIALOGE_H -#include - -#include - +#include "window_base.hpp" #include namespace MWWorld @@ -23,7 +20,7 @@ namespace MWGui using namespace MyGUI; - class DialogueWindow: public OEngine::GUI::Layout + class DialogueWindow: public WindowBase { public: DialogueWindow(MWWorld::Environment& environment); @@ -46,8 +43,6 @@ namespace MWGui private: void updateOptions(); - MWWorld::Environment& environment; - DialogeHistory* history; MyGUI::ListPtr topicsList; };