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

[DEV] update new e-property

Browse Source
This commit is contained in:
Edouard DUPIN 2016-02-24 22:29:01 +01:00
parent b6fa9c95e0
commit 11577515ff
21 changed files with 168 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ewol/event/Time.cpp
View File

@ -7,7 +7,6 @@
*/
#include <ewol/widget/Widget.h>
#include <esignal/details/Signal.hxx>
#undef __class__
#define __class__ "event::Time"
@ -34,5 +33,7 @@ namespace etk {
}
// declare for signal event
#include <esignal/details/ISignal.hxx>
template class esignal::Signal<ewol::event::Time>;
template class esignal::ISignal<ewol::event::Time>;

6
ewol/resource/Colored3DObject.cpp
View File

@ -10,7 +10,6 @@
#include <ewol/resource/Colored3DObject.h>
#include <gale/resource/Manager.h>
#include <gale/renderer/openGL/openGL-include.h>
#include <esignal/details/Signal.hxx>
#include <esignal/ISignal.h>
#undef __class__
@ -231,9 +230,12 @@ void ewol::resource::Colored3DObject::drawSquare(const vec3& _size,
}
draw(tmpVertices, _tmpColor, _transformationMatrix);
}
template<> std::string etk::to_string(ewol::resource::Colored3DObject const&) {
namespace etk {
template<> std::string to_string(ewol::resource::Colored3DObject const&) {
return "!!ewol::resource::Colored3DObject!ERROR!CAN_NOT_BE_CONVERT!!";
}
}
#include <esignal/details/ISignal.hxx>
// declare for signal event
template class esignal::ISignal<ewol::resource::Colored3DObject>;

50
ewol/widget/Button.cpp
View File

@ -95,7 +95,7 @@ void ewol::widget::Button::onRegenerateDisplay() {
bool ewol::widget::Button::onEventInput(const ewol::event::Input& _event) {
EWOL_VERBOSE("Event on BT : " << _event);
// disable event in the lock access mode :
if(ewol::widget::Button::lockAccess == propertyLock) {
if(ewol::widget::Button::lockAccess == *propertyLock) {
return false;
}
if( gale::key::status_leave == _event.getStatus()
@ -119,36 +119,36 @@ bool ewol::widget::Button::onEventInput(const ewol::event::Input& _event) {
if (true == m_mouseHover) {
if (1 == _event.getId()) {
if(gale::key::status_down == _event.getStatus()) {
EWOL_VERBOSE(propertyName.get() << " : Generate event : " << signalDown);
EWOL_VERBOSE(*propertyName << " : Generate event : " << signalDown);
signalDown.emit();
m_buttonPressed = true;
markToRedraw();
}
if(gale::key::status_up == _event.getStatus()) {
EWOL_VERBOSE(propertyName.get() << " : Generate event : " << signalUp);
EWOL_VERBOSE(*propertyName << " : Generate event : " << signalUp);
signalUp.emit();
m_buttonPressed = false;
markToRedraw();
}
if(gale::key::status_single == _event.getStatus()) {
if( ( propertyValue.get() == true
if( ( *propertyValue == true
&& ewol::widget::Button::lockWhenPressed == propertyLock)
|| ( propertyValue.get() == false
|| ( *propertyValue == false
&& ewol::widget::Button::lockWhenReleased == propertyLock) ) {
// nothing to do : Lock mode ...
// user might set himself the new correct value with @ref setValue(xxx)
} else {
// inverse value :
propertyValue.set((propertyValue.get())?false:true);
EWOL_VERBOSE(propertyName.get() << " : Generate event : " << signalPressed);
propertyValue.set((*propertyValue)?false:true);
EWOL_VERBOSE(*propertyName << " : Generate event : " << signalPressed);
signalPressed.emit();
EWOL_VERBOSE(propertyName.get() << " : Generate event : " << signalValue << " val=" << propertyValue );
signalValue.emit(propertyValue.get());
if( propertyToggleMode.get() == false
&& propertyValue.get() == true) {
EWOL_VERBOSE(*propertyName << " : Generate event : " << signalValue << " val=" << *propertyValue );
signalValue.emit(*propertyValue);
if( *propertyToggleMode == false
&& *propertyValue == true) {
propertyValue.set(false);
EWOL_VERBOSE(propertyName.get() << " : Generate event : " << signalValue << " val=" << propertyValue);
signalValue.emit(propertyValue.get());
EWOL_VERBOSE(*propertyName << " : Generate event : " << signalValue << " val=" << *propertyValue);
signalValue.emit(*propertyValue);
}
}
markToRedraw();
@ -186,7 +186,7 @@ void ewol::widget::Button::CheckStatus() {
changeStatusIn(STATUS_HOVER);
return;
}
if (propertyValue == true) {
if (*propertyValue == true) {
changeStatusIn(STATUS_DOWN);
}
changeStatusIn(STATUS_UP);
@ -210,17 +210,17 @@ void ewol::widget::Button::periodicCall(const ewol::event::Time& _event) {
void ewol::widget::Button::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::widget::Container2::onPropertyChangeValue(_paramPointer);
if (_paramPointer == propertyShape) {
m_shaper.setSource(propertyShape.get());
m_shaper.setSource(*propertyShape);
markToRedraw();
} else if (_paramPointer == propertyValue) {
if (propertyToggleMode == true) {
if (propertyValue.get() == false) {
if (*propertyToggleMode == true) {
if (*propertyValue == false) {
m_idWidgetDisplayed = 0;
} else {
m_idWidgetDisplayed = 1;
}
}
if (propertyEnableSingle == true) {
if (*propertyEnableSingle == true) {
if ( m_idWidgetDisplayed == 0
&& m_subWidget[0] == nullptr
&& m_subWidget[1] != nullptr) {
@ -234,27 +234,27 @@ void ewol::widget::Button::onPropertyChangeValue(const eproperty::Ref& _paramPoi
CheckStatus();
markToRedraw();
} else if (_paramPointer == propertyLock) {
if(ewol::widget::Button::lockAccess == propertyLock.get()) {
if(ewol::widget::Button::lockAccess == *propertyLock) {
m_buttonPressed = false;
m_mouseHover = false;
}
CheckStatus();
markToRedraw();
} else if (_paramPointer == propertyToggleMode) {
if (propertyValue.get() == true) {
propertyValue.get() = false;
if (*propertyValue == true) {
propertyValue.setDirect(false);
// TODO : change display and send event ...
}
if (propertyToggleMode.get() == false) {
if (*propertyToggleMode == false) {
m_idWidgetDisplayed = 0;
} else {
if (propertyValue.get() == false) {
if (*propertyValue == false) {
m_idWidgetDisplayed = 0;
} else {
m_idWidgetDisplayed = 1;
}
}
if (propertyEnableSingle.get() == true) {
if (*propertyEnableSingle == true) {
if ( m_idWidgetDisplayed == 0
&& m_subWidget[0] == nullptr
&& m_subWidget[1] != nullptr) {
@ -268,7 +268,7 @@ void ewol::widget::Button::onPropertyChangeValue(const eproperty::Ref& _paramPoi
CheckStatus();
markToRedraw();
} else if (_paramPointer == propertyEnableSingle) {
if (propertyEnableSingle == true) {
if (*propertyEnableSingle == true) {
if ( m_idWidgetDisplayed == 0
&& m_subWidget[0] == nullptr
&& m_subWidget[1] != nullptr) {

26
ewol/widget/CheckBox.cpp
View File

@ -122,27 +122,27 @@ bool ewol::widget::CheckBox::onEventInput(const ewol::event::Input& _event) {
}
bool previousPressed = m_buttonPressed;
EWOL_VERBOSE("Event on BT ... mouse hover : " << m_mouseHover);
if (true == m_mouseHover) {
if (1 == _event.getId()) {
if (m_mouseHover == true) {
if (_event.getId() == 1) {
if(gale::key::status_down == _event.getStatus()) {
EWOL_VERBOSE(propertyName.get() << " : Generate event : " << signalDown);
EWOL_VERBOSE(*propertyName << " : Generate event : " << signalDown);
signalDown.emit();
m_buttonPressed = true;
markToRedraw();
}
if(gale::key::status_up == _event.getStatus()) {
EWOL_VERBOSE(propertyName.get() << " : Generate event : " << signalUp);
EWOL_VERBOSE(*propertyName << " : Generate event : " << signalUp);
signalUp.emit();
m_buttonPressed = false;
markToRedraw();
}
if(gale::key::status_single == _event.getStatus()) {
// inverse value :
propertyValue.set((propertyValue.get())?false:true);
EWOL_VERBOSE(propertyName.get() << " : Generate event : " << signalPressed);
propertyValue.set((*propertyValue)?false:true);
EWOL_VERBOSE(*propertyName << " : Generate event : " << signalPressed);
signalPressed.emit();
EWOL_VERBOSE(propertyName.get() << " : Generate event : " << signalValue << " val=" << propertyValue );
signalValue.emit(propertyValue.get());
EWOL_VERBOSE(*propertyName << " : Generate event : " << signalValue << " val=" << propertyValue );
signalValue.emit(*propertyValue);
markToRedraw();
}
}
@ -167,14 +167,14 @@ bool ewol::widget::CheckBox::onEventEntry(const ewol::event::Entry& _event) {
}
void ewol::widget::CheckBox::CheckStatus() {
if (m_shaper.setState(propertyValue==true?1:0) == true) {
if (m_shaper.setState(*propertyValue==true?1:0) == true) {
markToRedraw();
}
if (m_buttonPressed == true) {
changeStatusIn(STATUS_PRESSED);
return;
}
if (true == m_mouseHover) {
if (m_mouseHover == true) {
changeStatusIn(STATUS_HOVER);
return;
}
@ -199,16 +199,16 @@ void ewol::widget::CheckBox::periodicCall(const ewol::event::Time& _event) {
void ewol::widget::CheckBox::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::widget::Container2::onPropertyChangeValue(_paramPointer);
if (_paramPointer == propertyShape) {
m_shaper.setSource(propertyShape.get());
m_shaper.setSource(*propertyShape);
markToRedraw();
} else if (_paramPointer == propertyValue) {
if (propertyValue.get() == false) {
if (*propertyValue == false) {
m_idWidgetDisplayed = convertId(0);
} else {
m_idWidgetDisplayed = convertId(1);
}
CheckStatus();
markToRedraw();
m_shaper.setActivateState(propertyValue==true?1:0);
m_shaper.setActivateState(*propertyValue==true?1:0);
}
}

6
ewol/widget/ColorBar.cpp
View File

@ -55,7 +55,7 @@ static etk::Color<> s_listColor[NB_BAND_COLOR+1] = {
void ewol::widget::ColorBar::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::Widget::onPropertyChangeValue(_paramPointer);
if (_paramPointer == propertyValue) {
propertyValue.get().setA(0xFF);
propertyValue.getDirect().setA(0xFF);
// estimate the cursor position:
EWOL_TODO("Later when really needed ...");
}
@ -218,9 +218,9 @@ bool ewol::widget::ColorBar::onEventInput(const ewol::event::Input& _event) {
estimateColor.setG(estimateColor.g() - estimateColor.g()*poroportionnalBlack);
estimateColor.setB(estimateColor.b() - estimateColor.b()*poroportionnalBlack);
}
if(propertyValue.get() != estimateColor) {
if(*propertyValue != estimateColor) {
propertyValue.set(estimateColor);
signalChange.emit(propertyValue.get());
signalChange.emit(*propertyValue);
}
return true;
}

6
ewol/widget/ContainerN.cpp
View File

@ -175,7 +175,7 @@ std::shared_ptr<ewol::Object> ewol::widget::ContainerN::getSubObjectNamed(const
}
void ewol::widget::ContainerN::systemDraw(const ewol::DrawProperty& _displayProp) {
if (propertyHide.get() == true){
if (*propertyHide == true){
// widget is hidden ...
return;
}
@ -234,7 +234,7 @@ void ewol::widget::ContainerN::onRegenerateDisplay() {
}
std::shared_ptr<ewol::Widget> ewol::widget::ContainerN::getWidgetAtPos(const vec2& _pos) {
if (propertyHide.get() == true) {
if (*propertyHide == true) {
return nullptr;
}
// for all element in the sizer ...
@ -269,7 +269,7 @@ bool ewol::widget::ContainerN::loadXML(const std::shared_ptr<const exml::Element
std::string tmpAttributeValue = _node->getAttribute("lock");
if (tmpAttributeValue.size()!=0) {
propertyLockExpand = tmpAttributeValue;
propertyLockExpand.set(tmpAttributeValue);
}
bool invertAdding=false;
tmpAttributeValue = _node->getAttribute("addmode");

10
ewol/widget/Entry.cpp
View File

@ -212,7 +212,7 @@ void ewol::widget::Entry::removeSelected() {
// remove data ...
m_displayCursorPos = pos1;
m_displayCursorPosSelection = pos1;
propertyValue->erase(pos1, pos2-pos1);
propertyValue.getDirect().erase(pos1, pos2-pos1);
markToRedraw();
}
@ -339,14 +339,14 @@ bool ewol::widget::Entry::onEventEntry(const ewol::event::Entry& _event) {
} else if (_event.getChar() == 0x7F) {
// SUPPR :
if (propertyValue->size() > 0 && m_displayCursorPos < (int64_t)propertyValue->size()) {
propertyValue->erase(m_displayCursorPos, 1);
propertyValue.getDirect().erase(m_displayCursorPos, 1);
m_displayCursorPos = std::max(m_displayCursorPos, 0);
m_displayCursorPosSelection = m_displayCursorPos;
}
} else if (_event.getChar() == 0x08) {
// DEL :
if (propertyValue->size() > 0 && m_displayCursorPos != 0) {
propertyValue->erase(m_displayCursorPos-1, 1);
propertyValue.getDirect().erase(m_displayCursorPos-1, 1);
m_displayCursorPos--;
m_displayCursorPos = std::max(m_displayCursorPos, 0);
m_displayCursorPosSelection = m_displayCursorPos;
@ -415,7 +415,7 @@ void ewol::widget::Entry::setInternalValue(const std::string& _newData) {
return;
}
}
propertyValue.get() = _newData;
propertyValue.setDirect(_newData);
markToRedraw();
}
@ -443,7 +443,7 @@ void ewol::widget::Entry::onEventClipboard(enum gale::context::clipBoard::clipbo
}
void ewol::widget::Entry::onCallbackEntryClean() {
propertyValue = "";
propertyValue.setDirect("");
m_displayStartPosition = 0;
m_displayCursorPos = 0;
m_displayCursorPosSelection = m_displayCursorPos;

2
ewol/widget/Gird.cpp
View File

@ -313,7 +313,7 @@ void ewol::widget::Gird::onRegenerateDisplay() {
}
std::shared_ptr<ewol::Widget> ewol::widget::Gird::getWidgetAtPos(const vec2& _pos) {
if (propertyHide == true) {
if (*propertyHide == true) {
return nullptr;
}
// for all element in the sizer ...

30
ewol/widget/Image.cpp
View File

@ -72,10 +72,10 @@ void ewol::widget::Image::onRegenerateDisplay() {
vec2 imageRealSize = m_imageRenderSize - imageBoder;
vec2 imageRealSizeMax = m_size - imageBoder;
vec2 ratioSizeDisplayRequested = propertyPosStop.get() - propertyPosStart.get();
vec2 ratioSizeDisplayRequested = *propertyPosStop - *propertyPosStart;
//imageRealSizeMax *= ratioSizeDisplayRequested;
vec2 delta = ewol::gravityGenerateDelta(propertyGravity, m_size-m_imageRenderSize);
vec2 delta = ewol::gravityGenerateDelta(*propertyGravity, m_size-m_imageRenderSize);
if (propertyFill->x() == true) {
imageRealSize.setX(imageRealSizeMax.x());
delta.setX(0.0);
@ -86,7 +86,7 @@ void ewol::widget::Image::onRegenerateDisplay() {
}
origin += delta;
if (propertyKeepRatio == true) {
if (*propertyKeepRatio == true) {
vec2 tmpSize = m_compositing.getRealSize();
//float ratio = tmpSize.x() / tmpSize.y();
float ratio = (tmpSize.x()*ratioSizeDisplayRequested.x()) / (tmpSize.y() * ratioSizeDisplayRequested.y());
@ -106,14 +106,14 @@ void ewol::widget::Image::onRegenerateDisplay() {
}
// set the somposition properties :
if (propertySmooth.get() == true) {
if (*propertySmooth == true) {
m_compositing.setPos(origin);
} else {
m_compositing.setPos(ivec2(origin));
}
m_compositing.printPart(imageRealSize, propertyPosStart, propertyPosStop);
m_compositing.printPart(imageRealSize, *propertyPosStart, *propertyPosStop);
//EWOL_DEBUG("Paint Image at : " << origin << " size=" << imageRealSize << " origin=" << origin);
EWOL_VERBOSE("Paint Image :" << propertySource << " realsize=" << m_compositing.getRealSize() << " size=" << imageRealSize);
EWOL_VERBOSE("Paint Image :" << *propertySource << " realsize=" << *m_compositing.getRealSize() << " size=" << imageRealSize);
}
void ewol::widget::Image::calculateMinMaxSize() {
@ -162,26 +162,26 @@ bool ewol::widget::Image::loadXML(const std::shared_ptr<const exml::Element>& _n
std::string tmpAttributeValue = _node->getAttribute("ratio");
if (tmpAttributeValue.size() != 0) {
if (etk::compare_no_case(tmpAttributeValue, "true") == true) {
propertyKeepRatio = true;
propertyKeepRatio.setDirect(true);
} else if (tmpAttributeValue == "1") {
propertyKeepRatio = true;
propertyKeepRatio.setDirect(true);
} else {
propertyKeepRatio = false;
propertyKeepRatio.setDirect(false);
}
}
tmpAttributeValue = _node->getAttribute("size");
if (tmpAttributeValue.size() != 0) {
//EWOL_CRITICAL(" Parse SIZE : " << tmpAttributeValue);
propertyImageSize = tmpAttributeValue;
propertyImageSize.setDirect(tmpAttributeValue);
//EWOL_CRITICAL(" == > " << propertyImageSize);
}
tmpAttributeValue = _node->getAttribute("border");
if (tmpAttributeValue.size() != 0) {
propertyBorder = tmpAttributeValue;
propertyBorder.setDirect(tmpAttributeValue);
}
tmpAttributeValue = _node->getAttribute("smooth");
if (tmpAttributeValue.size() != 0) {
propertySmooth = etk::string_to_bool(tmpAttributeValue);
propertySmooth.setDirect(etk::string_to_bool(tmpAttributeValue));
}
//EWOL_DEBUG("Load label:" << node->ToElement()->getText());
if (_node->size() != 0) {
@ -201,8 +201,8 @@ void ewol::widget::Image::onPropertyChangeValue(const eproperty::Ref& _paramPoin
|| _paramPointer == propertyImageSize) {
markToRedraw();
requestUpdateSize();
EWOL_VERBOSE("Set sources : " << propertySource << " size=" << propertyImageSize);
m_compositing.setSource(propertySource, propertyImageSize->getPixel());
EWOL_VERBOSE("Set sources : " << *propertySource << " size=" << *propertyImageSize);
m_compositing.setSource(*propertySource, propertyImageSize->getPixel());
} else if ( _paramPointer == propertyBorder
|| _paramPointer == propertyKeepRatio
|| _paramPointer == propertyPosStart
@ -214,7 +214,7 @@ void ewol::widget::Image::onPropertyChangeValue(const eproperty::Ref& _paramPoin
} else if (_paramPointer == propertySmooth) {
markToRedraw();
} else if (_paramPointer == propertyDistanceFieldMode) {
m_compositing.setDistanceFieldMode(propertyDistanceFieldMode.get());
m_compositing.setDistanceFieldMode(*propertyDistanceFieldMode);
markToRedraw();
}
}

2
ewol/widget/Layer.cpp
View File

@ -26,7 +26,7 @@ ewol::widget::Layer::~Layer() {
}
std::shared_ptr<ewol::Widget> ewol::widget::Layer::getWidgetAtPos(const vec2& _pos) {
if (propertyHide == true) {
if (*propertyHide == true) {
return nullptr;
}
// for all element in the sizer ...

22
ewol/widget/ListFileSystem.cpp
View File

@ -69,9 +69,9 @@ void ewol::widget::ListFileSystem::regenerateView() {
m_selectedLine = -1;
m_list.clear();
m_originScrooled.setValue(0,0);
etk::FSNode tmpFolder(propertyPath.get());
etk::FSNode tmpFolder(*propertyPath);
// get the new list :
m_list = tmpFolder.folderGetSubList(propertyShowHidden, propertyShowFolder, propertyShowFile, propertyFilter);
m_list = tmpFolder.folderGetSubList(*propertyShowHidden, *propertyShowFolder, *propertyShowFile, *propertyFilter);
// request a redraw ...
markToRedraw();
}
@ -114,7 +114,7 @@ bool ewol::widget::ListFileSystem::getTitle(int32_t _colomn, std::string &_myTit
uint32_t ewol::widget::ListFileSystem::getNuberOfRaw() {
int32_t offset = 0;
if (propertyShowFolder == true) {
if (*propertyShowFolder == true) {
if (propertyPath.get() == "/") {
offset = 1;
} else {
@ -126,8 +126,8 @@ uint32_t ewol::widget::ListFileSystem::getNuberOfRaw() {
bool ewol::widget::ListFileSystem::getElement(int32_t _colomn, int32_t _raw, std::string& _myTextToWrite, etk::Color<>& _fg, etk::Color<>& _bg) {
int32_t offset = 0;
if (propertyShowFolder == true) {
if (propertyPath.get() == "/") {
if (*propertyShowFolder == true) {
if (*propertyPath == "/") {
offset = 1;
} else {
offset = 2;
@ -165,8 +165,8 @@ bool ewol::widget::ListFileSystem::onItemEvent(int32_t _IdInput,
float _x,
float _y) {
int32_t offset = 0;
if (propertyShowFolder == true) {
if (propertyPath.get() == "/") {
if (*propertyShowFolder == true) {
if (*propertyPath == "/") {
offset = 1;
} else {
offset = 2;
@ -182,11 +182,11 @@ bool ewol::widget::ListFileSystem::onItemEvent(int32_t _IdInput,
m_selectedLine = _raw;
}
if (previousRaw != m_selectedLine) {
if( propertyShowFolder == true
if( *propertyShowFolder == true
&& m_selectedLine == 0) {
// "." folder
signalFolderSelect.emit(".");
} else if ( propertyShowFolder == true
} else if ( *propertyShowFolder == true
&& m_selectedLine == 1) {
// ".." folder
signalFolderSelect.emit("..");
@ -207,11 +207,11 @@ bool ewol::widget::ListFileSystem::onItemEvent(int32_t _IdInput,
}
}
} else {
if( propertyShowFolder == true
if( *propertyShowFolder == true
&& m_selectedLine == 0) {
// "." folder
signalFolderValidate.emit(".");
} else if ( propertyShowFolder == true
} else if ( *propertyShowFolder == true
&& m_selectedLine == 1) {
// ".." folder
signalFolderValidate.emit("..");

10
ewol/widget/PopUp.cpp
View File

@ -44,14 +44,14 @@ void ewol::widget::PopUp::onChangeSize() {
}
ewol::Padding padding = m_shaper.getPadding();
vec2 subWidgetSize = m_subWidget->getCalculateMinSize();
if (true == m_subWidget->canExpand().x()) {
if (m_subWidget->canExpand().x() == true) {
if (propertyLockExpand->x() == true) {
subWidgetSize.setX(m_minSize.x());
} else {
subWidgetSize.setX(m_size.x()-padding.xLeft());
}
}
if (true == m_subWidget->canExpand().y()) {
if (m_subWidget->canExpand().y() == true) {
if (propertyLockExpand->y() == true) {
subWidgetSize.setY(m_minSize.y());
} else {
@ -73,7 +73,7 @@ void ewol::widget::PopUp::onChangeSize() {
}
void ewol::widget::PopUp::systemDraw(const ewol::DrawProperty& _displayProp) {
if (propertyHide == true){
if (*propertyHide == true){
// widget is hidden ...
return;
}
@ -133,7 +133,7 @@ std::shared_ptr<ewol::Widget> ewol::widget::PopUp::getWidgetAtPos(const vec2& _p
void ewol::widget::PopUp::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::widget::Container::onPropertyChangeValue(_paramPointer);
if (_paramPointer == propertyShape) {
m_shaper.setSource(propertyShape);
m_shaper.setSource(*propertyShape);
markToRedraw();
requestUpdateSize();
} else if (_paramPointer == propertyLockExpand) {
@ -148,7 +148,7 @@ bool ewol::widget::PopUp::onEventInput(const ewol::event::Input& _event) {
if (_event.getId() == 0) {
return false;
}
if (propertyCloseOutEvent == true) {
if (*propertyCloseOutEvent == true) {
return false;
}
ewol::Padding padding = m_shaper.getPadding();

14
ewol/widget/Scroll.cpp
View File

@ -49,7 +49,7 @@ void ewol::widget::Scroll::calculateMinMaxSize() {
}
void ewol::widget::Scroll::systemDraw(const ewol::DrawProperty& _displayProp) {
if (propertyHide == true) {
if (*propertyHide == true) {
return;
}
if (m_subWidget != nullptr) {
@ -78,7 +78,7 @@ void ewol::widget::Scroll::onRegenerateDisplay() {
ewol::Padding paddingHori = m_shaperH.getPadding();
vec2 scrollOffset(0,0);
vec2 scrollSize(0,0);
if (nullptr!=m_subWidget) {
if (m_subWidget != nullptr) {
scrollOffset = m_subWidget->getOffset();
scrollSize = m_subWidget->getSize();
}
@ -114,7 +114,7 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
vec2 relativePos = relativePosition(_event.getPos());
vec2 scrollOffset(0,0);
vec2 scrollSize(0,0);
if (nullptr!=m_subWidget) {
if (m_subWidget != nullptr) {
scrollOffset = m_subWidget->getOffset();
scrollSize = m_subWidget->getSize();
}
@ -138,7 +138,7 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
scrollOffset.setY((int32_t)(scrollSize.y() * (relativePos.y()-SCROLL_BAR_SPACE) / (m_size.y()-SCROLL_BAR_SPACE*2)));
scrollOffset.setY(std::avg(0.0f, scrollOffset.y(), (scrollSize.y() - m_size.y()*propertyLimit->y())));
markToRedraw();
if (nullptr!=m_subWidget) {
if (m_subWidget != nullptr) {
m_subWidget->setOffset(scrollOffset);
}
return true;
@ -155,7 +155,7 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
scrollOffset.setX((int32_t)(scrollSize.x() * (relativePos.x()-SCROLL_BAR_SPACE) / (m_size.x()-SCROLL_BAR_SPACE*2)));
scrollOffset.setY(std::avg(0.0f, scrollOffset.x(), (scrollSize.x() - m_size.x()*propertyLimit->x())));
markToRedraw();
if (nullptr!=m_subWidget) {
if (m_subWidget != nullptr) {
m_subWidget->setOffset(scrollOffset);
}
return true;
@ -168,7 +168,7 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
scrollOffset.setY(scrollOffset.y()-m_pixelScrolling);
scrollOffset.setY(std::avg(0.0f, scrollOffset.y(), (scrollSize.y() - m_size.y()*propertyLimit->y())));
markToRedraw();
if (nullptr!=m_subWidget) {
if (m_subWidget != nullptr) {
m_subWidget->setOffset(scrollOffset);
}
return true;
@ -179,7 +179,7 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
scrollOffset.setY(scrollOffset.y()+m_pixelScrolling);
scrollOffset.setY(std::avg(0.0f, scrollOffset.y(), (scrollSize.y() - m_size.y()*propertyLimit->y())));
markToRedraw();
if (nullptr!=m_subWidget) {
if (m_subWidget != nullptr) {
m_subWidget->setOffset(scrollOffset);
}
return true;

28
ewol/widget/Sizer.cpp
View File

@ -51,7 +51,7 @@ void ewol::widget::Sizer::onChangeSize() {
continue;
}
vec2 tmpSize = it->getCalculateMinSize();
if (propertyMode == ewol::widget::Sizer::modeVert) {
if (*propertyMode == ewol::widget::Sizer::modeVert) {
minSize = vec2(std::max(minSize.x(), tmpSize.x()),
minSize.y() + tmpSize.y());
} else {
@ -65,7 +65,7 @@ void ewol::widget::Sizer::onChangeSize() {
// -2- Calculate the size to add at every elements...
float deltaExpandSize = 0.0f;
if (nbWidgetExpand != ivec2(0,0)) {
if (propertyMode == ewol::widget::Sizer::modeVert) {
if (*propertyMode == ewol::widget::Sizer::modeVert) {
deltaExpandSize = (localWidgetSize.y() - minSize.y()) / float(nbWidgetExpand.y());
} else {
deltaExpandSize = (localWidgetSize.x() - minSize.x()) / float(nbWidgetExpand.x());
@ -86,7 +86,7 @@ void ewol::widget::Sizer::onChangeSize() {
float residualNext = 0.0f;
// get the number of element that need to devide...
int32_t countCalculation = nbWidgetExpand.x();
if (propertyMode == ewol::widget::Sizer::modeVert) {
if (*propertyMode == ewol::widget::Sizer::modeVert) {
countCalculation = nbWidgetExpand.y();
}
// -4.1- Update every subWidget size
@ -97,7 +97,7 @@ void ewol::widget::Sizer::onChangeSize() {
vec2 tmpSizeMin = it->getSize();
vec2 tmpSizeMax = it->getCalculateMaxSize();
// Now update his size his size in X and the curent sizer size in Y:
if (propertyMode == ewol::widget::Sizer::modeVert) {
if (*propertyMode == ewol::widget::Sizer::modeVert) {
if (it->canExpand().y() == true) {
float sizeExpand = tmpSizeMin.y() + deltaExpandSize;
if (sizeExpand > tmpSizeMax.y()) {
@ -129,7 +129,7 @@ void ewol::widget::Sizer::onChangeSize() {
if (countCalculation <= 0) {
break;
}
if (propertyMode == ewol::widget::Sizer::modeVert) {
if (*propertyMode == ewol::widget::Sizer::modeVert) {
deltaExpandSize = residualNext / float(countCalculation);
} else {
deltaExpandSize = residualNext / float(countCalculation);
@ -145,7 +145,7 @@ void ewol::widget::Sizer::onChangeSize() {
continue;
}
// Now update his size his size in X and the curent sizer size in Y:
if (propertyMode == ewol::widget::Sizer::modeVert) {
if (*propertyMode == ewol::widget::Sizer::modeVert) {
if (it->canExpand().x() == false) {
continue;
}
@ -175,7 +175,7 @@ void ewol::widget::Sizer::onChangeSize() {
continue;
}
vec2 size = it->getSize();
if (propertyMode == ewol::widget::Sizer::modeVert) {
if (*propertyMode == ewol::widget::Sizer::modeVert) {
underSize += vec2(0.0f, size.y());
underSize.setX(std::max(underSize.x(), size.x()));
} else {
@ -194,13 +194,13 @@ void ewol::widget::Sizer::onChangeSize() {
}
vec2 origin;
vec2 size = it->getSize();
if (propertyMode == ewol::widget::Sizer::modeVert) {
if (*propertyMode == ewol::widget::Sizer::modeVert) {
origin = vec2ClipInt32(tmpOrigin+m_offset + ewol::gravityGenerateDelta(propertyGravity, vec2(underSize.x()-size.x(),0.0f)));
} else {
origin = vec2ClipInt32(tmpOrigin+m_offset + ewol::gravityGenerateDelta(propertyGravity, vec2(0.0f, underSize.y()-size.y())));
}
it->setOrigin(origin);
if (propertyMode == ewol::widget::Sizer::modeVert) {
if (*propertyMode == ewol::widget::Sizer::modeVert) {
tmpOrigin.setY(tmpOrigin.y() + size.y());
} else {
tmpOrigin.setX(tmpOrigin.x() + size.x());
@ -236,7 +236,7 @@ void ewol::widget::Sizer::calculateMinMaxSize() {
vec2 tmpSize = it->getCalculateMinSize();
EWOL_VERBOSE("[" << getId() << "] NewMinSize=" << tmpSize);
EWOL_VERBOSE("[" << getId() << "] {" << getObjectType() << "} Get minSize="<< tmpSize);
if (propertyMode == ewol::widget::Sizer::modeVert) {
if (*propertyMode == ewol::widget::Sizer::modeVert) {
m_minSize.setY(m_minSize.y() + tmpSize.y());
if (tmpSize.x()>m_minSize.x()) {
m_minSize.setX(tmpSize.x());
@ -253,7 +253,7 @@ void ewol::widget::Sizer::calculateMinMaxSize() {
}
int32_t ewol::widget::Sizer::subWidgetAdd(std::shared_ptr<ewol::Widget> _newWidget) {
if (propertyAnimation == animationNone) {
if (*propertyAnimation == animationNone) {
return ewol::widget::ContainerN::subWidgetAdd(_newWidget);
}
// TODO : ...
@ -261,7 +261,7 @@ int32_t ewol::widget::Sizer::subWidgetAdd(std::shared_ptr<ewol::Widget> _newWidg
}
int32_t ewol::widget::Sizer::subWidgetAddStart(std::shared_ptr<ewol::Widget> _newWidget) {
if (propertyAnimation == animationNone) {
if (*propertyAnimation == animationNone) {
return ewol::widget::ContainerN::subWidgetAddStart(_newWidget);
}
// TODO : ...
@ -269,7 +269,7 @@ int32_t ewol::widget::Sizer::subWidgetAddStart(std::shared_ptr<ewol::Widget> _ne
}
void ewol::widget::Sizer::subWidgetRemove(std::shared_ptr<ewol::Widget> _newWidget) {
if (propertyAnimation == animationNone) {
if (*propertyAnimation == animationNone) {
ewol::widget::ContainerN::subWidgetRemove(_newWidget);
return;
}
@ -278,7 +278,7 @@ void ewol::widget::Sizer::subWidgetRemove(std::shared_ptr<ewol::Widget> _newWidg
}
void ewol::widget::Sizer::subWidgetUnLink(std::shared_ptr<ewol::Widget> _newWidget) {
if (propertyAnimation == animationNone) {
if (*propertyAnimation == animationNone) {
ewol::widget::ContainerN::subWidgetUnLink(_newWidget);
return;
}

28
ewol/widget/Slider.cpp
View File

@ -81,11 +81,11 @@ bool ewol::widget::Slider::onEventInput(const ewol::event::Input& _event) {
|| gale::key::status_move == _event.getStatus()) {
// get the new position :
EWOL_VERBOSE("Event on Slider (" << relativePos.x() << "," << relativePos.y() << ")");
float oldValue = propertyValue.get();
updateValue(propertyMinimum + (float)(relativePos.x() - dotRadius) / (m_size.x()-2*dotRadius) * (propertyMaximum-propertyMinimum));
if (oldValue != propertyValue) {
EWOL_VERBOSE(" new value : " << propertyValue << " in [" << propertyMinimum << ".." << propertyMaximum << "]");
signalChange.emit(propertyValue);
float oldValue = *propertyValue;
updateValue(*propertyMinimum + (float)(relativePos.x() - dotRadius) / (m_size.x()-2*dotRadius) * (*propertyMaximum-*propertyMinimum));
if (oldValue != *propertyValue) {
EWOL_VERBOSE(" new value : " << *propertyValue << " in [" << *propertyMinimum << ".." << *propertyMaximum << "]");
signalChange.emit(*propertyValue);
}
return true;
}
@ -94,12 +94,12 @@ bool ewol::widget::Slider::onEventInput(const ewol::event::Input& _event) {
}
void ewol::widget::Slider::updateValue(float _newValue) {
_newValue = std::max(std::min(_newValue, propertyMaximum.get()), propertyMinimum.get());
if (propertyStep.get() == 0.0f) {
propertyValue = _newValue;
_newValue = std::max(std::min(_newValue, *propertyMaximum), *propertyMinimum);
if (*propertyStep == 0.0f) {
propertyValue.setDirect(_newValue);
} else {
float basicVal = (int64_t)(_newValue / propertyStep.get());
propertyValue = basicVal * propertyStep.get();
float basicVal = (int64_t)(_newValue / *propertyStep);
propertyValue.setDirect(basicVal * *propertyStep);
}
markToRedraw();
}
@ -108,19 +108,19 @@ void ewol::widget::Slider::updateValue(float _newValue) {
void ewol::widget::Slider::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::Widget::onPropertyChangeValue(_paramPointer);
if (_paramPointer == propertyValue) {
updateValue(propertyValue.get());
updateValue(*propertyValue);
return;
}
if (_paramPointer == propertyMinimum) {
updateValue(propertyValue.get());
updateValue(*propertyValue);
return;
}
if (_paramPointer == propertyMaximum) {
updateValue(propertyValue.get());
updateValue(*propertyValue);
return;
}
if (_paramPointer == propertyStep) {
updateValue(propertyValue.get());
updateValue(*propertyValue);
return;
}
}

8
ewol/widget/Spin.cpp
View File

@ -46,11 +46,11 @@ void ewol::widget::Spin::onPropertyChangeValue(const eproperty::Ref& _paramPoint
EWOL_ERROR("Can not acces at entry ...");
return;
}
checkValue(propertyValue.get());
checkValue(*propertyValue);
} else if (_paramPointer == propertyMin) {
checkValue(propertyValue.get());
checkValue(*propertyValue);
} else if (_paramPointer == propertyMax) {
checkValue(propertyValue.get());
checkValue(*propertyValue);
} else if (_paramPointer == propertyIncrement) {
} else if (_paramPointer == propertyMantis) {
@ -79,7 +79,7 @@ void ewol::widget::Spin::updateGui() {
void ewol::widget::Spin::checkValue(int64_t _value) {
_value = std::avg(propertyMin.get(), _value, propertyMax.get());
propertyValue.get() = _value;
propertyValue.setDirect(_value);
m_widgetEntry->propertyValue.set(etk::to_string(_value));
}

22
ewol/widget/WSlider.cpp
View File

@ -63,7 +63,7 @@ void ewol::widget::WSlider::onChangeSize() {
std::advance(it, m_windowsSources);
if ( it != m_subWidget.end()
&& *it != nullptr) {
if (propertyTransitionMode == sladingTransitionHori) {
if (*propertyTransitionMode == sladingTransitionHori) {
(*it)->setOrigin( vec2(m_origin.x() + factor*(m_size.x()*m_slidingProgress),
m_origin.y())
+ m_offset);
@ -79,7 +79,7 @@ void ewol::widget::WSlider::onChangeSize() {
std::advance(it, m_windowsDestination);
if ( it != m_subWidget.end()
&& *it != nullptr) {
if (propertyTransitionMode == sladingTransitionHori) {
if (*propertyTransitionMode == sladingTransitionHori) {
(*it)->setOrigin( vec2(m_origin.x() + factor*(m_size.x()*m_slidingProgress - m_size.x()),
m_origin.y())
+ m_offset);
@ -117,9 +117,9 @@ void ewol::widget::WSlider::subWidgetSelectSet(int32_t _id) {
if (it->getId() == _id) {
if (it->propertyName.get() != "") {
// change the internal event parameter (in case...) ==> no event generation
propertySelectWidget.get() = it->propertyName.get();
propertySelectWidget.setDirect(it->propertyName.get());
} else {
propertySelectWidget.get() = "";
propertySelectWidget.setDirect("");
}
break;
}
@ -130,7 +130,7 @@ void ewol::widget::WSlider::subWidgetSelectSet(int32_t _id) {
} else {
subWidgetSelectSetVectorId(-1);
// change the internal event parameter (in case...) ==> no event generation
propertySelectWidget.get() = "";
propertySelectWidget.setDirect("");
}
}
@ -146,9 +146,9 @@ void ewol::widget::WSlider::subWidgetSelectSet(const std::shared_ptr<ewol::Widge
subWidgetSelectSetVectorId(iii);
if (_widgetPointer->propertyName.get() != "") {
// change the internal event parameter (in case...) ==> no event generation
propertySelectWidget.get() = _widgetPointer->propertyName.get();
propertySelectWidget.setDirect(_widgetPointer->propertyName.get());
} else {
propertySelectWidget.get() = "";
propertySelectWidget.setDirect("");
}
return;
}
@ -168,7 +168,7 @@ void ewol::widget::WSlider::subWidgetSelectSet(const std::string& _widgetName) {
&& it->propertyName.get() == _widgetName) {
subWidgetSelectSetVectorId(iii);
// change the internal event parameter (in case...) ==> no event generation
propertySelectWidget.get() = _widgetName;
propertySelectWidget.setDirect(_widgetName);
return;
}
iii++;
@ -210,7 +210,7 @@ void ewol::widget::WSlider::periodicCall(const ewol::event::Time& _event) {
}
void ewol::widget::WSlider::systemDraw(const ewol::DrawProperty& _displayProp) {
if (propertyHide == true){
if (*propertyHide == true){
// widget is hidden ...
return;
}
@ -276,7 +276,7 @@ void ewol::widget::WSlider::onPropertyChangeValue(const eproperty::Ref& _paramPo
ewol::widget::ContainerN::onPropertyChangeValue(_paramPointer);
if (_paramPointer == propertySelectWidget) {
if (propertySelectWidget.get() != "") {
subWidgetSelectSet(propertySelectWidget);
subWidgetSelectSet(*propertySelectWidget);
}
} else if (_paramPointer == propertyTransitionSpeed) {
// nothing to do ...
@ -286,7 +286,7 @@ void ewol::widget::WSlider::onPropertyChangeValue(const eproperty::Ref& _paramPo
}
std::shared_ptr<ewol::Widget> ewol::widget::WSlider::getWidgetAtPos(const vec2& _pos) {
if (propertyHide == true) {
if (*propertyHide == true) {
return nullptr;
}
if (m_windowsDestination == m_windowsSources) {

22
ewol/widget/Widget.cpp
View File

@ -82,7 +82,7 @@ void ewol::Widget::onChangeSize() {
}
bool ewol::Widget::setFocus() {
if (propertyCanFocus == true) {
if (*propertyCanFocus == true) {
if (m_hasFocus == false) {
m_hasFocus = true;
onGetFocus();
@ -93,7 +93,7 @@ bool ewol::Widget::setFocus() {
}
bool ewol::Widget::rmFocus() {
if (propertyCanFocus == true) {
if (*propertyCanFocus == true) {
if (m_hasFocus == true) {
m_hasFocus = false;
onLostFocus();
@ -142,7 +142,7 @@ void ewol::Widget::setOffset(const vec2& _newVal) {
(0,0)
*/
void ewol::Widget::systemDraw(const ewol::DrawProperty& _displayProp) {
if (propertyHide == true){
if (*propertyHide == true){
// widget is hidden ...
return;
}
@ -298,14 +298,14 @@ void ewol::Widget::calculateMinMaxSize() {
}
vec2 ewol::Widget::getCalculateMinSize() {
if (propertyHide == false) {
if (*propertyHide == false) {
return m_minSize;
}
return vec2(0,0);
}
vec2 ewol::Widget::getCalculateMaxSize() {
if (propertyHide == false) {
if (*propertyHide == false) {
return m_maxSize;
}
return vec2(ULTIMATE_MAX_SIZE,ULTIMATE_MAX_SIZE);
@ -332,21 +332,21 @@ void ewol::Widget::checkMaxSize() {
}
vec2 ewol::Widget::getSize() {
if (propertyHide == false) {
if (*propertyHide == false) {
return m_size;
}
return vec2(0,0);
}
bvec2 ewol::Widget::canExpand() {
if (propertyHide == false) {
return propertyExpand;
if (*propertyHide == false) {
return *propertyExpand;
}
return bvec2(false,false);
}
const bvec2& ewol::Widget::canFill() {
return propertyFill;
return *propertyFill;
}
// ----------------------------------------------------------------------------------------------------------------
@ -583,7 +583,7 @@ void ewol::Widget::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
}
if (error == true) {
EWOL_ERROR("Can not set a 'min size' > 'max size' reset to maximum ...");
propertyMaxSize.get() = gale::Dimension(vec2(ULTIMATE_MAX_SIZE,ULTIMATE_MAX_SIZE),gale::Dimension::Pixel);
propertyMaxSize.setDirect(gale::Dimension(vec2(ULTIMATE_MAX_SIZE,ULTIMATE_MAX_SIZE),gale::Dimension::Pixel));
}
requestUpdateSize();
} else if (_paramPointer == propertyMinSize) {
@ -599,7 +599,7 @@ void ewol::Widget::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
}
if (error == true) {
EWOL_ERROR("Can not set a 'min size' > 'max size' set nothing ...");
propertyMinSize = gale::Dimension(vec2(0,0),gale::Dimension::Pixel);
propertyMinSize.setDirect(gale::Dimension(vec2(0,0),gale::Dimension::Pixel));
}
requestUpdateSize();
} else if (_paramPointer == propertyAnnimationTypeStart) {

12
ewol/widget/meta/ColorChooser.cpp
View File

@ -106,7 +106,7 @@ void ewol::widget::ColorChooser::onPropertyChangeValue(const eproperty::Ref& _pa
}
void ewol::widget::ColorChooser::onCallbackColorChangeRed(const float& _newColor) {
propertyValue.get().setR(_newColor);
propertyValue.getDirect().setR(_newColor);
if (m_widgetColorBar != nullptr) {
m_widgetColorBar->propertyValue.set(propertyValue);
}
@ -114,7 +114,7 @@ void ewol::widget::ColorChooser::onCallbackColorChangeRed(const float& _newColor
}
void ewol::widget::ColorChooser::onCallbackColorChangeGreen(const float& _newColor) {
propertyValue.get().setG(_newColor);
propertyValue.getDirect().setG(_newColor);
if (m_widgetColorBar != nullptr) {
m_widgetColorBar->propertyValue.set(propertyValue);
}
@ -122,7 +122,7 @@ void ewol::widget::ColorChooser::onCallbackColorChangeGreen(const float& _newCol
}
void ewol::widget::ColorChooser::onCallbackColorChangeBlue(const float& _newColor) {
propertyValue.get().setB(_newColor);
propertyValue.getDirect().setB(_newColor);
if (m_widgetColorBar != nullptr) {
m_widgetColorBar->propertyValue.set(propertyValue);
}
@ -130,7 +130,7 @@ void ewol::widget::ColorChooser::onCallbackColorChangeBlue(const float& _newColo
}
void ewol::widget::ColorChooser::onCallbackColorChangeAlpha(const float& _newColor) {
propertyValue.get().setA(_newColor);
propertyValue.getDirect().setA(_newColor);
if (m_widgetColorBar != nullptr) {
m_widgetColorBar->propertyValue.set(propertyValue);
}
@ -140,8 +140,8 @@ void ewol::widget::ColorChooser::onCallbackColorChangeAlpha(const float& _newCol
void ewol::widget::ColorChooser::onCallbackColorChange(const etk::Color<>& _newColor) {
// == > colorBar has change ...
uint8_t tmpAlpha = propertyValue->a();
propertyValue.get() = _newColor;
propertyValue.get().setA(tmpAlpha);
propertyValue.getDirect() = _newColor;
propertyValue.getDirect().setA(tmpAlpha);
if (m_widgetRed != nullptr) {
m_widgetRed->propertyValue.set(propertyValue->r());
}

22
ewol/widget/meta/FileChooser.cpp
View File

@ -127,7 +127,7 @@ ewol::widget::FileChooser::~FileChooser() {
void ewol::widget::FileChooser::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::widget::Composer::onPropertyChangeValue(_paramPointer);
if (_paramPointer == propertyPath) {
propertyPath.get() += "/";
propertyPath.getDirect() = *propertyPath + "/";
updateCurrentFolder();
} else if (_paramPointer == propertyFile) {
propertySetOnWidgetNamed("[" + etk::to_string(getId()) + "]file-shooser:entry-file", "value", propertyFile);
@ -148,7 +148,7 @@ void ewol::widget::FileChooser::onCallbackEntryFolderChangeValue(const std::stri
void ewol::widget::FileChooser::onCallbackEntryFileChangeValue(const std::string& _value) {
// == > change the file name
propertyFile.get() = _value;
propertyFile.setDirect(_value);
// update the selected file in the list :
propertySetOnWidgetNamed("[" + etk::to_string(getId()) + "]file-shooser:list-files", "select", propertyFile);
}
@ -171,11 +171,11 @@ void ewol::widget::FileChooser::onCallbackHidenFileChangeChangeValue(const bool&
void ewol::widget::FileChooser::onCallbackListFolderSelectChange(const std::string& _value) {
// == > this is an internal event ...
EWOL_DEBUG(" old PATH: '" << propertyPath << "' + '" << _value << "'");
propertyPath.get() += _value;
EWOL_DEBUG("new PATH: '" << propertyPath << "'");
propertyPath.get() = etk::simplifyPath(propertyPath);
propertyFile.set("");
EWOL_DEBUG(" old PATH: '" << *propertyPath << "' + '" << _value << "'");
propertyPath.setDirect(propertyPath.get() + _value);
EWOL_DEBUG("new PATH: '" << *propertyPath << "'");
propertyPath.setDirect(etk::simplifyPath(*propertyPath));
propertyFile.setDirect("");
updateCurrentFolder();
}
@ -210,16 +210,16 @@ void ewol::widget::FileChooser::onCallbackHomePressed() {
std::string tmpUserFolder = etk::getUserHomeFolder();
EWOL_DEBUG("new PATH : \"" << tmpUserFolder << "\"");
propertyPath.get() = etk::simplifyPath(tmpUserFolder);
propertyPath.setDirect(etk::simplifyPath(tmpUserFolder));
propertyFile.set("");
propertyFile.setDirect("");
updateCurrentFolder();
}
void ewol::widget::FileChooser::updateCurrentFolder() {
if (propertyPath.get() != "") {
if (*propertyPath != "") {
if (propertyPath.get()[propertyPath->size()-1] != '/') {
propertyPath.get() += "/";
propertyPath.getDirect() += "/";
}
}
propertySetOnWidgetNamed("[" + etk::to_string(getId()) + "]file-shooser:list-files", "path", propertyPath);

2
ewol/widget/meta/SpinBase.cpp
View File

@ -40,7 +40,7 @@ void ewol::widget::SpinBase::init(enum ewol::widget::spinPosition _mode,
ewol::widget::Sizer::init(ewol::widget::Sizer::modeHori);
propertyLockExpand.set(bvec2(true,true));
propertyShape.set(_shaperName);
propertySpinMode = _mode;
propertySpinMode.set(_mode);
propertyGravity.set(gravity_center);
updateGui();
}