[DEV] update to the new ewol system

This commit is contained in:
2013-09-02 06:45:12 +02:00
parent b5371c4d13
commit ad12b68ead
12 changed files with 67 additions and 75 deletions

View File

@@ -12,7 +12,7 @@
#include <BufferManager.h>
#include <ColorizeManager.h>
#include <MainWindows.h>
#include <ewol/eObject/EObject.h>
#include <ewol/renderer/EObject.h>
#undef __class__
#define __class__ "BufferView"

View File

@@ -14,6 +14,7 @@
#include <BufferManager.h>
#include <appl/globalMsg.h>
#include <ewol/widget/List.h>
#include <ewol/widget/Windows.h>
namespace appl
{

View File

@@ -17,7 +17,7 @@
#include <SearchData.h>
#include <ewol/widget/WidgetManager.h>
#include <ewol/eObject/EObject.h>
#include <ewol/renderer/EObject.h>
#undef __class__
@@ -231,7 +231,7 @@ bool CodeView::OnEventInput(const ewol::EventInput& _event)
limitedPos.setValue(etk_avg(1, limitedPos.x(), m_size.x()-1),
etk_avg(1, limitedPos.y(), m_size.y()-1));
if (true == WidgetScrooled::OnEventInput(_event)) {
ewol::widgetManager::FocusKeep(this);
KeepFocus();
// nothing to do ... done on upper widget ...
return true;
}
@@ -245,7 +245,7 @@ bool CodeView::OnEventInput(const ewol::EventInput& _event)
if (ewol::keyEvent::typeMouse == _event.GetType()) {
if (ewol::keyEvent::statusDown == _event.GetStatus()) {
m_buttunOneSelected = true;
ewol::widgetManager::FocusKeep(this);
KeepFocus();
// TODO : Set something good
BufferText* tmpBuffer = BufferManager::Get(m_bufferID);
if (NULL!=tmpBuffer) {
@@ -263,7 +263,7 @@ bool CodeView::OnEventInput(const ewol::EventInput& _event)
}
if (ewol::keyEvent::statusSingle == _event.GetStatus()) {
if (ewol::keyEvent::typeMouse == _event.GetType()) {
ewol::widgetManager::FocusKeep(this);
KeepFocus();
BufferText* tmpBuffer = BufferManager::Get(m_bufferID);
if (NULL!=tmpBuffer) {
tmpBuffer->MouseEvent(limitedPos);
@@ -312,7 +312,7 @@ bool CodeView::OnEventInput(const ewol::EventInput& _event)
tmpBuffer->MouseEvent(limitedPos);
}
ewol::clipBoard::Request(ewol::clipBoard::clipboardSelection);
ewol::widgetManager::FocusKeep(this);
KeepFocus();
}
}
return true;
@@ -456,14 +456,14 @@ void CodeView::OnGetFocus(void)
/*
ewol::widgetMessageMultiCast::Send(GetWidgetId(), ednMsgBufferId, m_bufferID);
*/
ewol::Keyboard(true);
ShowKeyboard();
APPL_INFO("Focus - In");
}
void CodeView::OnLostFocus(void)
{
ewol::Keyboard(false);
HideKeyboard();
APPL_INFO("Focus - out");
}

View File

@@ -28,7 +28,8 @@
#include <ewol/widget/meta/FileChooser.h>
#include <ewol/widget/meta/Parameter.h>
#include <ewol/widget/WidgetManager.h>
#include <ewol/eObject/EObject.h>
#include <ewol/renderer/EObject.h>
#include <ewol/renderer/eContext.h>
#include <date/date.h>
namespace appl
@@ -355,11 +356,11 @@ void MainWindows::OnReceiveMessage(const ewol::EMessage& _msg)
}
etk::UString windowsTitle = "edn - ";
windowsTitle += directName;
ewol::SetTitle(windowsTitle);
SetTitle(windowsTitle);
return;
} else {
m_widgetLabelFileName->SetLabel("");
ewol::SetTitle("edn");
SetTitle("edn");
}
return;
// TODO : Set the Title ....
@@ -382,8 +383,8 @@ void MainWindows::OnReceiveMessage(const ewol::EMessage& _msg)
tmpWidget->MenuAdd("About", "", tmpSubWidget);
}
} else if (_msg.GetMessage() == ednMsgGuiReloadShader) {
ewol::resource::ReLoadResources();
ewol::ForceRedrawAll();
ewol::GetContext().GetResourcesManager().ReLoadResources();
ewol::GetContext().ForceRedrawAll();
} else if (_msg.GetMessage() == ednMsgGuiExit) {
// TODO ...
}