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

[DEV] UniChar ==> UChar & Hach ==> Hash

Browse Source
This commit is contained in:
Edouard DUPIN
2013-10-18 21:15:02 +02:00
parent 16f78eaef2
commit cf8a720924
10 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/appl/Gui/CodeView.cpp
View File

@@ -103,7 +103,7 @@ bool CodeView::calculateMinSize(void)
void CodeView::calculateMaxSize(void)
{
m_maxSize.setX(2048);
int32_t letterHeight = m_displayText.calculateSize(etk::UniChar('A')).y();
int32_t letterHeight = m_displayText.calculateSize(etk::UChar('A')).y();
BufferText* tmpBuffer = BufferManager::get(m_bufferID);
if (NULL!=tmpBuffer) {
m_maxSize.setY(tmpBuffer->getNumberOfLine() * letterHeight);

2
sources/appl/Gui/MainWindows.cpp
View File

@@ -237,7 +237,7 @@ MainWindows::MainWindows(void) {
// add generic shortcut ...
// (shift, control, alt, meta, uniChar_t unicodeValue, const char * generateEventId, etk::UString& data)
// (shift, control, alt, meta, etk::UChar unicodeValue, const char * generateEventId, etk::UString& data)
shortCutAdd("ctrl+o", ednMsgGuiOpen, "", true);
shortCutAdd("ctrl+n", ednMsgGuiNew, "", true);

6
sources/appl/Gui/TextViewer.cpp
View File

@@ -122,13 +122,13 @@ void appl::TextViewer::onRegenerateDisplay(void) {
m_displayText.setColor(etk::Color<>(0, 0, 0, 256));
float countNbLine = 1;
esize_t countColomn = 0;
vec3 tmpLetterSize = m_displayText.calculateSize((uniChar_t)'A');
vec3 tmpLetterSize = m_displayText.calculateSize((etk::UChar)'A');
vec3 positionCurentDisplay(0.0f, m_size.y()-tmpLetterSize.y(), 0.0f);
m_displayText.setPos(positionCurentDisplay);
// the siplay string :
etk::UString stringToDisplay;
esize_t bufferElementSize = 0;
etk::UniChar currentValue;
etk::UChar currentValue;
bool isSelect = false;
int32_t selectPosStart = etk_min(m_buffer->m_cursorPos, m_buffer->m_cursorSelectPos);
int32_t selectPosStop = etk_max(m_buffer->m_cursorPos, m_buffer->m_cursorSelectPos);
@@ -148,7 +148,7 @@ void appl::TextViewer::onRegenerateDisplay(void) {
}
bufferElementSize = m_buffer->get(iii, currentValue);
//APPL_DEBUG(" element size : " << iii << " : " << bufferElementSize);
if (currentValue == etk::UniChar::Return) {
if (currentValue == etk::UChar::Return) {
countNbLine += 1;
countColomn = 0;
if (bufferElementSize == 0) {