atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEBUG] remove segfault when set /.. path

Browse Source
This commit is contained in:
Edouard DUPIN 2014-05-14 21:14:36 +02:00
parent 9682de59e2
commit 836172f749
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/etk vendored

@ -1 +1 @@
Subproject commit 6bec5ddccb307d3b42b253c37ceb3dc7afced304 Subproject commit 2059e5f06a95cb4aa02ef084b6f134f7d3ad000b

27
sources/ewol/widget/ListFileSystem.cpp
View File

@ -137,19 +137,28 @@ bool ewol::widget::ListFileSystem::getTitle(int32_t _colomn, std::string &_myTit
uint32_t ewol::widget::ListFileSystem::getNuberOfRaw(void) { uint32_t ewol::widget::ListFileSystem::getNuberOfRaw(void) {
int32_t offset = 0; int32_t offset = 0;
if (true == m_showFolder) { if (m_showFolder == true) {
offset = 2; if (m_folder == "/") {
offset = 1;
} else {
offset = 2;
}
} }
return m_list.size() + offset; return m_list.size() + offset;
} }
bool ewol::widget::ListFileSystem::getElement(int32_t _colomn, int32_t _raw, std::string& _myTextToWrite, etk::Color<>& _fg, etk::Color<>& _bg) { bool ewol::widget::ListFileSystem::getElement(int32_t _colomn, int32_t _raw, std::string& _myTextToWrite, etk::Color<>& _fg, etk::Color<>& _bg) {
int32_t offset = 0; int32_t offset = 0;
if (true == m_showFolder) { if (m_showFolder == true) {
offset = 2; if (m_folder == "/") {
offset = 1;
} else {
offset = 2;
}
if (_raw == 0) { if (_raw == 0) {
_myTextToWrite = "."; _myTextToWrite = ".";
} else if (_raw == 1) { } else if ( _raw == 1
&& m_folder != "/") {
_myTextToWrite = ".."; _myTextToWrite = "..";
} }
} }
@ -179,8 +188,12 @@ bool ewol::widget::ListFileSystem::onItemEvent(int32_t _IdInput,
float _x, float _x,
float _y) { float _y) {
int32_t offset = 0; int32_t offset = 0;
if (true == m_showFolder) { if (m_showFolder == true) {
offset = 2; if (m_folder == "/") {
offset = 1;
} else {
offset = 2;
}
} }
if (_typeEvent == ewol::key::statusSingle) { if (_typeEvent == ewol::key::statusSingle) {
EWOL_DEBUG("Event on List : IdInput=" << _IdInput << " colomn=" << _colomn << " raw=" << _raw ); EWOL_DEBUG("Event on List : IdInput=" << _IdInput << " colomn=" << _colomn << " raw=" << _raw );