From 489261a6ae514dafe2aea679bbca17c1c52cf46b Mon Sep 17 00:00:00 2001 From: gugus Date: Sun, 15 Apr 2012 21:02:54 +0200 Subject: [PATCH] Close button works. --- apps/openmw/mwgui/container.cpp | 10 +++++++++- apps/openmw/mwgui/container.hpp | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp index 2defad2075..3f27351a98 100644 --- a/apps/openmw/mwgui/container.cpp +++ b/apps/openmw/mwgui/container.cpp @@ -29,11 +29,14 @@ ContainerWindow::ContainerWindow(WindowManager& parWindowManager,MWWorld::Enviro { setText("_Main", "Name of Container"); center(); + adjustWindowCaption(); getWidget(containerWidget, "Items"); getWidget(takeButton, "TakeButton"); getWidget(closeButton, "CloseButton"); + closeButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ContainerWindow::onByeClicked); + setText("CloseButton","Close"); setText("TakeButton","Take All"); } @@ -136,8 +139,13 @@ void ContainerWindow::open(MWWorld::Ptr& container) setVisible(true); } -void Update() +void ContainerWindow::Update() { } +void ContainerWindow::onByeClicked(MyGUI::Widget* _sender) +{ + mEnvironment.mWindowManager->setGuiMode(MWGui::GuiMode::GM_Game); +} + diff --git a/apps/openmw/mwgui/container.hpp b/apps/openmw/mwgui/container.hpp index e027f48fe7..76905a6814 100644 --- a/apps/openmw/mwgui/container.hpp +++ b/apps/openmw/mwgui/container.hpp @@ -53,7 +53,7 @@ namespace MWGui MyGUI::ButtonPtr closeButton; - + void onByeClicked(MyGUI::Widget* _sender); //MWWorld::Ptr& mContainer;