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

Gui is back to normal

Browse Source
This commit is contained in:
Edouard Dupin 2012-07-20 14:37:46 +02:00
parent 12cd1db0e1
commit 4e7eac1399
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jni/appl/Buffer/BufferEmpty.cpp
View File

@ -81,7 +81,7 @@ int32_t BufferEmpty::Display(ewol::OObject2DTextColored& OOTextNormal,
Vector2D<float> textPos; Vector2D<float> textPos;
textPos.x = 20; textPos.x = 20;
textPos.y = 20; textPos.y = sizeY - 20 - letterHeight;
myColor = ColorizeManager::Get("normal"); myColor = ColorizeManager::Get("normal");
OOTextBold.SetColor(myColor->GetFG()); OOTextBold.SetColor(myColor->GetFG());
@ -90,7 +90,7 @@ int32_t BufferEmpty::Display(ewol::OObject2DTextColored& OOTextNormal,
myColor = ColorizeManager::Get("commentDoxygen"); myColor = ColorizeManager::Get("commentDoxygen");
OOTextNormal.SetColor(myColor->GetFG()); OOTextNormal.SetColor(myColor->GetFG());
textPos.y = (int32_t)(textPos.y + letterHeight*1.30); textPos.y = (int32_t)(textPos.y - letterHeight*1.30);
tmpDisplay = "No Buffer Availlable to display"; tmpDisplay = "No Buffer Availlable to display";
OOTextNormal.Text(textPos, tmpDisplay); OOTextNormal.Text(textPos, tmpDisplay);

5
jni/appl/Buffer/BufferText.cpp
View File

@ -346,6 +346,9 @@ int32_t BufferText::Display(ewol::OObject2DTextColored& OOTextNormal,
APPL_VERBOSE("Start display of text buffer [" << displayStartBufferPos<< ".." << mylen << "]"); APPL_VERBOSE("Start display of text buffer [" << displayStartBufferPos<< ".." << mylen << "]");
APPL_VERBOSE("cursor Pos : " << m_cursorPos << "start at pos=" << displayStartBufferPos); APPL_VERBOSE("cursor Pos : " << m_cursorPos << "start at pos=" << displayStartBufferPos);
// note corection of the openGl invertion system :
y = sizeY - y;
y -= letterHeight;
OOTextNormal.clippingDisable(); OOTextNormal.clippingDisable();
OOColored.clippingDisable(); OOColored.clippingDisable();
@ -450,7 +453,7 @@ int32_t BufferText::Display(ewol::OObject2DTextColored& OOTextNormal,
lineMaxSize = 0.0; lineMaxSize = 0.0;
idX =0; idX =0;
pixelX = x_base + SEPARATION_SIZE_LINE_NUMBER; pixelX = x_base + SEPARATION_SIZE_LINE_NUMBER;
y += letterHeight; y -= letterHeight;
displayLines++; displayLines++;
currentLineID++; currentLineID++;
OOTextNormal.clippingDisable(); OOTextNormal.clippingDisable();

4
jni/appl/Gui/CodeView.cpp
View File

@ -74,6 +74,7 @@ CodeView::CodeView(void)
RegisterMultiCast(ednMsgGuiChangeCharset); RegisterMultiCast(ednMsgGuiChangeCharset);
RegisterMultiCast(ednMsgGuiFind); RegisterMultiCast(ednMsgGuiFind);
RegisterMultiCast(ednMsgGuiReplace); RegisterMultiCast(ednMsgGuiReplace);
SetLimitScrolling(0.2);
} }
CodeView::~CodeView(void) CodeView::~CodeView(void)
@ -243,6 +244,9 @@ bool CodeView::OnEventKbMove(ewol::eventKbType_te typeEvent, ewol::eventKbMoveTy
bool CodeView::OnEventInput(ewol::inputType_te type, int32_t IdInput, ewol::eventInputType_te typeEvent, Vector2D<float> pos) bool CodeView::OnEventInput(ewol::inputType_te type, int32_t IdInput, ewol::eventInputType_te typeEvent, Vector2D<float> pos)
{ {
Vector2D<float> relativePos = RelativePosition(pos); Vector2D<float> relativePos = RelativePosition(pos);
// corection for the openGl abstraction
relativePos.y = m_size.y - relativePos.y;
if (m_bufferID < 0) { if (m_bufferID < 0) {
return false; return false;
} }

4
jni/appl/Gui/MainWindows.cpp
View File

@ -321,10 +321,12 @@ void MainWindows::OnReceiveMessage(ewol::EObject * CallerObject, const char * ev
} else { } else {
tmpWidget->SetTitle("Properties"); tmpWidget->SetTitle("Properties");
PopUpWidgetPush(tmpWidget); PopUpWidgetPush(tmpWidget);
tmpWidget->MenuAdd("Affichage", "", NULL); tmpWidget->MenuAddGroup("Editor");
tmpWidget->MenuAdd("Editor", "", NULL); tmpWidget->MenuAdd("Editor", "", NULL);
tmpWidget->MenuAdd("Polices & Color", "", NULL); tmpWidget->MenuAdd("Polices & Color", "", NULL);
tmpWidget->MenuAdd("Highlight", "", NULL); tmpWidget->MenuAdd("Highlight", "", NULL);
tmpWidget->MenuAddGroup("Genral");
tmpWidget->MenuAdd("Affichage", "", NULL);
tmpWidget->MenuAdd("About", "", NULL); tmpWidget->MenuAdd("About", "", NULL);
} }
} }