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

[DEBUG] some big correction on the treeview...

Browse Source
This commit is contained in:
Edouard DUPIN 2018-08-29 21:15:05 +02:00
parent 6454bf59c4
commit 63ac2d7e07
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ewol/widget/TreeView.cpp
View File

@ -23,7 +23,11 @@ ewol::widget::TreeView::TreeView():
propertyIconTreeViewSize(this, "iconTreeViewSize", propertyIconTreeViewSize(this, "iconTreeViewSize",
20, 20,
"Size of the icon for treeView", "Size of the icon for treeView",
&ewol::widget::TreeView::onChangePropertyOffsetTreeView) { &ewol::widget::TreeView::onChangePropertyOffsetTreeView),
propertyTextIsDecorated(this, "textIsDecorated",
true,
"Text is draw as decorated mode",
&ewol::widget::TreeView::onChangePropertyTextDecorated) {
addObjectType("ewol::widget::TreeView"); addObjectType("ewol::widget::TreeView");
} }
@ -59,7 +63,12 @@ vec2 ewol::widget::TreeView::calculateElementSize(const ivec2& _pos) {
iconSize += propertyIconTreeViewSize.get(); iconSize += propertyIconTreeViewSize.get();
} }
} }
vec3 textSize = tmpText.calculateSizeDecorated(myTextToWrite); vec3 textSize;
if (propertyTextIsDecorated.get() == true) {
textSize = tmpText.calculateSizeDecorated(myTextToWrite);
} else {
textSize = tmpText.calculateSize(myTextToWrite);
}
ivec2 count = getMatrixSize(); ivec2 count = getMatrixSize();
return vec2(textSize.x() + treeOffset + iconSize, return vec2(textSize.x() + treeOffset + iconSize,
etk::max(textSize.y(), iconSize) + m_paddingSizeY*2 etk::max(textSize.y(), iconSize) + m_paddingSizeY*2
@ -125,10 +134,18 @@ void ewol::widget::TreeView::drawElement(const ivec2& _pos, const vec2& _start,
addOObject(tmpText); addOObject(tmpText);
tmpText->setColor(fg); tmpText->setColor(fg);
tmpText->setPos(posStart); tmpText->setPos(posStart);
tmpText->printDecorated(myTextToWrite);; if (propertyTextIsDecorated.get() == true) {
tmpText->printDecorated(myTextToWrite);
} else {
tmpText->print(myTextToWrite);
} }
} }
} }
}
void ewol::widget::TreeView::onChangePropertyTextDecorated() {
markToRedraw();
}
void ewol::widget::TreeView::onChangePropertyOffsetTreeView() { void ewol::widget::TreeView::onChangePropertyOffsetTreeView() {
markToRedraw(); markToRedraw();

2
ewol/widget/TreeView.hpp
View File

@ -26,6 +26,7 @@ namespace ewol {
public: // properties public: // properties
eproperty::Value<float> propertyOffsetTreeView; //!< indentation betwwen every new element. eproperty::Value<float> propertyOffsetTreeView; //!< indentation betwwen every new element.
eproperty::Value<float> propertyIconTreeViewSize; //!< Size of the icon. eproperty::Value<float> propertyIconTreeViewSize; //!< Size of the icon.
eproperty::Value<bool> propertyTextIsDecorated; //!< Size of the icon.
protected: protected:
TreeView(); TreeView();
void init() override; void init() override;
@ -49,6 +50,7 @@ namespace ewol {
void drawElement(const ivec2& _pos, const vec2& _start, const vec2& _size) override; void drawElement(const ivec2& _pos, const vec2& _start, const vec2& _size) override;
protected: protected:
virtual void onChangePropertyOffsetTreeView(); virtual void onChangePropertyOffsetTreeView();
virtual void onChangePropertyTextDecorated();
bool onItemEvent(const ewol::event::Input& _event, const ivec2& _pos, const vec2& _mousePosition) override; bool onItemEvent(const ewol::event::Input& _event, const ivec2& _pos, const vec2& _mousePosition) override;
virtual void onItemExpandEvent(const ivec2& _pos) { }; virtual void onItemExpandEvent(const ivec2& _pos) { };