LoweBowe/LumixEngine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

made compilable after master had been merged

Browse source
This commit is contained in:
Mikulas Florek 2013-12-23 19:06:46 +01:00
parent 1d41e84b74
commit d2bca6d865
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/core/event_manager.cpp
View file

@ -26,7 +26,14 @@ EventManager::Listener& EventManager::addListener(Event::Type type)
void EventManager::removeListener(Event::Type type, const Listener& listener)
{
ASSERT(false); // TODO
vector<Listener>& listeners = m_listeners[type];
for(int i = 0; i < listeners.size(); ++i)
{
if(listeners[i] == listener)
{
listeners.eraseFast(i);
}
}
}

15
src/editor_native/log_ui.cpp
View file

@ -10,23 +10,20 @@ LogUI::LogUI(MainFrame& main_frame)
, m_main_frame(main_frame)
{
setArea(0.4f, 0, 0.7f, 0, 1, 0, 1, 0);
main_frame.getEditorClient()->getEventManager().registerListener(Lux::ServerMessageType::LOG_MESSAGE, this, &LogUI::onLogMessage);
main_frame.getEditorClient()->getEventManager().addListener(Lux::ServerMessageType::LOG_MESSAGE).bind<LogUI, &LogUI::onLogMessage>(this);
}
void LogUI::onLogMessage(void* user_data, Lux::Event& evt)
void LogUI::onLogMessage(Lux::Event& evt)
{
ASSERT(user_data);
LogUI* that = static_cast<LogUI*>(user_data);
Lux::UI::Block* container = that->getContainer();
float y = container->getChildCount() > 0 ? container->getChild(container->getChildCount() -1 )->getLocalArea().bottom : 0;
float y = getContainer()->getChildCount() > 0 ? getContainer()->getChild(getContainer()->getChildCount() -1 )->getLocalArea().bottom : 0;
Lux::LogEvent log_evt = static_cast<Lux::LogEvent&>(evt);
Lux::UI::Block* cell = new Lux::UI::Block(that->getGui(), that->getContainer(), "_text");
Lux::UI::Block* cell = new Lux::UI::Block(getGui(), getContainer(), "_text");
cell->setBlockText(log_evt.system.c_str());
cell->setArea(0, 0, 0, y, 0.3f, 0, 0, y + 20);
cell = new Lux::UI::Block(that->getGui(), that->getContainer(), "_text");
cell = new Lux::UI::Block(getGui(), getContainer(), "_text");
cell->setBlockText(log_evt.message.c_str());
cell->setArea(0.3f, 0, 0, y, 1, 0, 0, y + 20);
that->layout();
layout();
}

2
src/editor_native/log_ui.h
View file

@ -28,7 +28,7 @@ class LogUI : public Lux::UI::Scrollable
LogUI(MainFrame& main_frame);
private:
static void onLogMessage(void* user_data, Lux::Event& evt);
void onLogMessage(Lux::Event& evt);
private:
MainFrame& m_main_frame;