HeeroYui/edn
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correction of the CR comming from X11

Browse Source
This commit is contained in:
Edouard Dupin 2012-01-18 22:56:14 +01:00
parent a53903d628
commit 411bf03e74
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jni/edn/Buffer/BufferText.cpp
View File

@ -1051,8 +1051,10 @@ void BufferText::AddChar(char * UTF8data)
} else if (UTF8data[0] == '\n') {
etk::VectorType<int8_t> tmpVect;
if (true == globals::IsSetShift()) {
EDN_ERROR("kjhkjhkjhkjh");
tmpVect.PushBack('\r');
} else {
EDN_ERROR("plop");
tmpVect.PushBack('\n');
// if Auto indent Enable ==> we get the start of the previous line and add it to tne new one
if (true == globals::IsSetAutoIndent() ) {

2
jni/edn/CustumWidget/CodeView/CodeView.cpp
View File

@ -117,7 +117,7 @@ bool CodeView::OnEventArea(const char * generateEventId, etkFloat_t x, etkFloat_
bool CodeView::OnEventKb(ewol::eventKbType_te typeEvent, char UTF8_data[UTF8_MAX_SIZE])
{
EDN_DEBUG("KB EVENT : \"" << UTF8_data << "\" size=" << strlen(UTF8_data) << "type=" << typeEvent);
//EDN_DEBUG("KB EVENT : \"" << UTF8_data << "\" size=" << strlen(UTF8_data) << "type=" << (int32_t)typeEvent);
if (typeEvent == ewol::EVENT_KB_TYPE_DOWN) {
m_bufferManager->Get(m_bufferID)->AddChar(UTF8_data);
OnRegenerateDisplay();

11
jni/edn/init.cpp
View File

@ -71,9 +71,9 @@ void APP_Init(int argc, char *argv[])
ewol::SetFontFolder("Font");
#ifdef EWOL_USE_FREE_TYPE
ewol::SetDefaultFont("freefont/FreeMono.ttf", 12);
//ewol::SetDefaultFont("freefont/FreeMono.ttf", 12);
//ewol::SetDefaultFont("freefont/FreeMonoBold.ttf", 12);
//ewol::SetDefaultFont("ACharmingFont.ttf", 45);
ewol::SetDefaultFont("ACharmingFont.ttf", 45);
//ewol::SetDefaultFont("Monospace/Monospace", 40);
//ewol::SetDefaultFont("unispace.ttf", 12);
#else
@ -138,6 +138,13 @@ void APP_Init(int argc, char *argv[])
}
}
}
{
etk::File myfile((char *)"licence.txt", etk::FILE_TYPE_DIRECT);
if (false == myBufferManager->Exist(myfile) ) {
int32_t idBuffOpened = myBufferManager->Open(myfile);
MsgBroadcastCore::getInstance()->SendMessage(NULL, EDN_MSG__CURRENT_CHANGE_BUFFER_ID, idBuffOpened);
}
}
if (NULL == basicWindows) {
EDN_ERROR("Can not allocate the basic windows");
ewol::Stop();