teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Move OEngine::Gui::Layout to MWGui

Browse source
This commit is contained in:
scrawl 2015-05-01 02:09:57 +02:00
parent 9f74be8fcb
commit 223e3a53f5
13 changed files with 26 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/CMakeLists.txt
View file

@ -33,7 +33,7 @@ add_openmw_dir (mwrender
# )
add_openmw_dir (mwgui
textinput widgets race class birth review windowmanagerimp console dialogue
layout textinput widgets race class birth review windowmanagerimp console dialogue
windowbase statswindow messagebox journalwindow charactercreation
mapwindow windowpinnablebase tooltips scrollwindow bookwindow
formatting inventorywindow container hud countdialog tradewindow settingswindow

12
apps/openmw/mwbase/windowmanager.hpp
View file

@ -26,14 +26,6 @@ namespace MyGUI
class UString;
}
namespace OEngine
{
namespace GUI
{
class Layout;
}
}
namespace ESM
{
struct Class;
@ -58,6 +50,8 @@ namespace MWWorld
namespace MWGui
{
class Layout;
class Console;
class SpellWindow;
class TradeWindow;
@ -241,7 +235,7 @@ namespace MWBase
virtual void addVisitedLocation(const std::string& name, int x, int y) = 0;
/// Hides dialog and schedules dialog to be deleted.
virtual void removeDialog(OEngine::GUI::Layout* dialog) = 0;
virtual void removeDialog(MWGui::Layout* dialog) = 0;
///Gracefully attempts to exit the topmost GUI mode
/** No guarentee of actually closing the window **/

2
apps/openmw/mwgui/hud.hpp
View file

@ -16,7 +16,7 @@ namespace MWGui
class SpellIcons;
class ItemWidget;
class HUD : public OEngine::GUI::Layout, public LocalMapBase
class HUD : public Layout, public LocalMapBase
{
public:
HUD(CustomMarkerCollection& customMarkers, int fpsLevel, DragAndDrop* dragAndDrop);

5
libs/openengine/gui/layout.cpp → apps/openmw/mwgui/layout.cpp
View file

@ -6,9 +6,7 @@
#include <MyGUI_TextBox.h>
#include <MyGUI_Window.h>
namespace OEngine
{
namespace GUI
namespace MWGui
{
void Layout::initialise(const std::string& _layout, MyGUI::Widget* _parent)
{
@ -78,4 +76,3 @@ namespace GUI
}
}
}

9
libs/openengine/gui/layout.hpp → apps/openmw/mwgui/layout.hpp
View file

@ -1,12 +1,11 @@
#ifndef OENGINE_MYGUI_LAYOUT_H
#define OENGINE_MYGUI_LAYOUT_H
#ifndef OPENMW_MWGUI_LAYOUT_H
#define OPENMW_MWGUI_LAYOUT_H
#include <string>
#include <MyGUI_WidgetDefines.h>
#include <MyGUI_Widget.h>
namespace OEngine {
namespace GUI
namespace MWGui
{
/** The Layout class is an utility class used to load MyGUI layouts
from xml files, and to manipulate member widgets.
@ -60,5 +59,5 @@ namespace GUI
std::string mLayoutName;
MyGUI::VectorWidgetPtr mListWindowRoot;
};
}}
}
#endif

4
apps/openmw/mwgui/mainmenu.cpp
View file

@ -30,7 +30,7 @@ namespace MWGui
{
MainMenu::MainMenu(int w, int h)
: OEngine::GUI::Layout("openmw_mainmenu.layout")
: Layout("openmw_mainmenu.layout")
, mButtonBox(0), mWidth (w), mHeight (h)
, mSaveGameDialog(NULL)
, mBackground(NULL)
@ -80,7 +80,7 @@ namespace MWGui
MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_MainMenu) &&
MWBase::Environment::get().getStateManager()->getState() == MWBase::StateManager::State_NoGame);
OEngine::GUI::Layout::setVisible (visible);
Layout::setVisible (visible);
}
void MainMenu::onNewGameConfirmed()

4
apps/openmw/mwgui/mainmenu.hpp
View file

@ -1,7 +1,7 @@
#ifndef OPENMW_GAME_MWGUI_MAINMENU_H
#define OPENMW_GAME_MWGUI_MAINMENU_H
#include <openengine/gui/layout.hpp>
#include "layout.hpp"
namespace Gui
{
@ -15,7 +15,7 @@ namespace MWGui
class SaveGameDialog;
class VideoWidget;
class MainMenu : public OEngine::GUI::Layout
class MainMenu : public Layout
{
int mWidth;
int mHeight;

2
apps/openmw/mwgui/messagebox.hpp
View file

@ -51,7 +51,7 @@ namespace MWGui
int mLastButtonPressed;
};
class MessageBox : public OEngine::GUI::Layout
class MessageBox : public Layout
{
public:
MessageBox (MessageBoxManager& parMessageBoxManager, const std::string& message);

4
apps/openmw/mwgui/tooltips.hpp
View file

@ -2,7 +2,7 @@
#ifndef MWGUI_TOOLTIPS_H
#define MWGUI_TOOLTIPS_H
#include <openengine/gui/layout.hpp>
#include "layout.hpp"
#include "../mwworld/ptr.hpp"
#include "widgets.hpp"
@ -45,7 +45,7 @@ namespace MWGui
bool wordWrap;
};
class ToolTips : public OEngine::GUI::Layout
class ToolTips : public Layout
{
public:
ToolTips();

4
apps/openmw/mwgui/windowbase.hpp
View file

@ -1,7 +1,7 @@
#ifndef MWGUI_WINDOW_BASE_H
#define MWGUI_WINDOW_BASE_H
#include <openengine/gui/layout.hpp>
#include "layout.hpp"
namespace MWBase
{
@ -13,7 +13,7 @@ namespace MWGui
class WindowManager;
class DragAndDrop;
class WindowBase: public OEngine::GUI::Layout
class WindowBase: public Layout
{
public:
WindowBase(const std::string& parLayout);

6
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -422,7 +422,7 @@ namespace MWGui
// Delete any dialogs which are no longer in use
if (!mGarbageDialogs.empty())
{
for (std::vector<OEngine::GUI::Layout*>::iterator it = mGarbageDialogs.begin(); it != mGarbageDialogs.end(); ++it)
for (std::vector<Layout*>::iterator it = mGarbageDialogs.begin(); it != mGarbageDialogs.end(); ++it)
{
delete *it;
}
@ -722,7 +722,7 @@ namespace MWGui
mStatsWindow->updateSkillArea();
}
void WindowManager::removeDialog(OEngine::GUI::Layout*dialog)
void WindowManager::removeDialog(Layout*dialog)
{
if (!dialog)
return;
@ -1566,7 +1566,7 @@ namespace MWGui
return mCursorVisible;
}
void WindowManager::trackWindow(OEngine::GUI::Layout *layout, const std::string &name)
void WindowManager::trackWindow(Layout *layout, const std::string &name)
{
MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize();
MyGUI::IntPoint pos(static_cast<int>(Settings::Manager::getFloat(name + " x", "Windows") * viewSize.width),

6
apps/openmw/mwgui/windowmanagerimp.hpp
View file

@ -242,7 +242,7 @@ namespace MWGui
virtual void addVisitedLocation(const std::string& name, int x, int y);
///Hides dialog and schedules dialog to be deleted.
virtual void removeDialog(OEngine::GUI::Layout* dialog);
virtual void removeDialog(Layout* dialog);
///Gracefully attempts to exit the topmost GUI mode
virtual void exitCurrentGuiMode();
@ -366,7 +366,7 @@ namespace MWGui
bool mConsoleOnlyScripts;
std::map<MyGUI::Window*, std::string> mTrackedWindows;
void trackWindow(OEngine::GUI::Layout* layout, const std::string& name);
void trackWindow(Layout* layout, const std::string& name);
void onWindowChangeCoord(MyGUI::Window* _sender);
std::string mSelectedSpell;
@ -448,7 +448,7 @@ namespace MWGui
SFO::CursorManager* mCursorManager;
std::vector<OEngine::GUI::Layout*> mGarbageDialogs;
std::vector<Layout*> mGarbageDialogs;
void cleanupGarbage();
GuiWindow mShown; // Currently shown windows in inventory mode

6
libs/openengine/CMakeLists.txt
View file

@ -1,7 +1,3 @@
set(OENGINE_GUI
gui/layout.cpp
)
set(OENGINE_BULLET
bullet/BtOgre.cpp
bullet/BtOgreExtras.h
@ -15,7 +11,7 @@ set(OENGINE_BULLET
bullet/trace.h
)
set(OENGINE_ALL ${OENGINE_GUI} ${OENGINE_BULLET})
set(OENGINE_ALL ${OENGINE_BULLET})
set(OENGINE_LIBRARY "oengine")
set(OENGINE_LIBRARY ${OENGINE_LIBRARY} PARENT_SCOPE)