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

Ewol change the idea of how the Font are managed

Browse Source
This commit is contained in:
Edouard Dupin
2012-08-22 18:18:59 +02:00
parent e27720372b
commit 76cd7bef21
5 changed files with 51 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Sources/appl/Buffer/BufferEmpty.cpp
View File

@@ -76,8 +76,7 @@ int32_t BufferEmpty::Display(ewol::OObject2DTextColored& OOTextNormal,
// Get color :
Colorize *myColor = NULL;
int32_t fontId = OOTextNormal.GetFontID();
int32_t letterHeight = ewol::GetHeight(fontId);
int32_t letterHeight = OOTextNormal.GetHeight();
Vector2D<float> textPos;
textPos.x = 20;

25
Sources/appl/Buffer/BufferText.cpp
View File

@@ -289,9 +289,8 @@ int32_t BufferText::Display(ewol::OObject2DTextColored& OOTextNormal,
bool selIsRect;
int32_t selHave;
int32_t fontId = OOTextNormal.GetFontID();
int32_t letterWidth = ewol::GetWidth(fontId, "A");
int32_t letterHeight = ewol::GetHeight(fontId);
int32_t letterWidth = OOTextNormal.GetSize("A").x;
int32_t letterHeight = OOTextNormal.GetHeight();
int32_t displayStartLineId = offsetY / letterHeight - 1;
displayStartLineId = etk_max(0, displayStartLineId);
@@ -479,9 +478,18 @@ int32_t BufferText::Display(ewol::OObject2DTextColored& OOTextNormal,
int32_t BufferText::GetMousePosition(int32_t fontId, int32_t width, int32_t height)
{
// TODO : Set it back ...
#if 1
int32_t letterWidth = 8;
int32_t letterHeight = 15;
#else
int32_t letterWidth = ewol::GetWidth(fontId, "9");
int32_t letterHeight = ewol::GetHeight(fontId);
/*
int32_t letterWidth = OOTextNormal.GetSize("A").x;
int32_t letterHeight = OOTextNormal.GetHeight();
*/
#endif
int32_t lineOffset = height / letterHeight;
//******************************* get the X position : *******************************************
@@ -513,7 +521,9 @@ int32_t BufferText::GetMousePosition(int32_t fontId, int32_t width, int32_t heig
new_i = iii;
displaywidth = m_EdnBuf.GetExpandedChar(new_i, idX, displayChar, currentChar);
if (currentChar!='\n') {
int32_t drawSize = ewol::GetWidth(fontId, displayChar);
// TODO : Set it back ...
//int32_t drawSize = ewol::GetWidth(fontId, displayChar);
int32_t drawSize = 50;
APPL_VERBOSE(" Element : " << currentChar << "=\"" << (char)currentChar << "\" display offset=" << pixelX << "px width=" << drawSize << "px");
pixelX += drawSize;
if (width <= pixelX) {
@@ -870,8 +880,13 @@ Vector2D<float> BufferText::GetPosition(int32_t fontId, bool& centerRequested)
// get font porperties :
// TODO : change this :
// TODO : Set it back ...
/*
float letterWidth = ewol::GetWidth(fontId, "A");
float letterHeight = ewol::GetHeight(fontId);
*/
float letterWidth = 10;
float letterHeight = 15;
outputPosition.x *= letterWidth;
outputPosition.y *= letterHeight;
return outputPosition;