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

[DEV] continue integration of property (build but seg fault)

Browse Source
This commit is contained in:
Edouard DUPIN 2016-02-14 15:04:44 +01:00
parent 1a3bbc297c
commit e6e817bfcd
93 changed files with 1342 additions and 3513 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ewol/context/InputManager.cpp
View File

@ -359,8 +359,8 @@ void ewol::context::InputManager::state(enum gale::key::type _type,
// we have an event previously ... check delay between click and offset position // we have an event previously ... check delay between click and offset position
if (currentTime - eventTable[_pointerID].lastTimeEvent > localLimit.sepatateTime) { if (currentTime - eventTable[_pointerID].lastTimeEvent > localLimit.sepatateTime) {
cleanElement(eventTable, _pointerID); cleanElement(eventTable, _pointerID);
} else if( abs(eventTable[_pointerID].downStart.x() - _pos.x()) >= localLimit.DpiOffset } else if( std::abs(eventTable[_pointerID].downStart.x() - _pos.x()) >= localLimit.DpiOffset
|| abs(eventTable[_pointerID].downStart.y() - _pos.y()) >= localLimit.DpiOffset ){ || std::abs(eventTable[_pointerID].downStart.y() - _pos.y()) >= localLimit.DpiOffset ){
cleanElement(eventTable, _pointerID); cleanElement(eventTable, _pointerID);
} }
} }
@ -442,8 +442,8 @@ void ewol::context::InputManager::state(enum gale::key::type _type,
gale::key::status_up, gale::key::status_up,
_pos); _pos);
// generate event (single) // generate event (single)
if( abs(eventTable[_pointerID].downStart.x() - _pos.x()) < localLimit.DpiOffset if( std::abs(eventTable[_pointerID].downStart.x() - _pos.x()) < localLimit.DpiOffset
&& abs(eventTable[_pointerID].downStart.y() - _pos.y()) < localLimit.DpiOffset ){ && std::abs(eventTable[_pointerID].downStart.y() - _pos.y()) < localLimit.DpiOffset ){
// Save current position : // Save current position :
eventTable[_pointerID].downStart = _pos; eventTable[_pointerID].downStart = _pos;
// save start time // save start time

4
ewol/object/Manager.cpp
View File

@ -44,7 +44,7 @@ void ewol::object::Manager::displayListObject() {
for (auto &it : m_eObjectList) { for (auto &it : m_eObjectList) {
std::shared_ptr<ewol::Object> element = it.lock(); std::shared_ptr<ewol::Object> element = it.lock();
if (element != nullptr) { if (element != nullptr) {
EWOL_INFO(" [" << element->getId() << "] ref=" << element.use_count()-1 << " name='" << element->getName() << "' type=" << element->getObjectType()); EWOL_INFO(" [" << element->getId() << "] ref=" << element.use_count()-1 << " name='" << element->propertyName.get() << "' type=" << element->getObjectType());
} }
} }
} }
@ -102,7 +102,7 @@ std::shared_ptr<ewol::Object> ewol::object::Manager::get(const std::string& _nam
for (auto &it : m_eObjectList) { for (auto &it : m_eObjectList) {
std::shared_ptr<ewol::Object> element = it.lock(); std::shared_ptr<ewol::Object> element = it.lock();
if ( element != nullptr if ( element != nullptr
&& element->getName() == _name) { && element->propertyName.get() == _name) {
return element; return element;
} }
} }

6
ewol/object/Object.cpp
View File

@ -46,10 +46,10 @@ void ewol::Object::removeParent() {
} }
ewol::Object::Object() : ewol::Object::Object() :
propertyName(*this, "name", "", "Object name, might be a unique reference in all the program"),
m_objectHasBeenInit(false), m_objectHasBeenInit(false),
m_destroy(false), m_destroy(false),
m_static(false), m_static(false),
m_name(*this, "name", "", "Object name, might be a unique reference in all the program"),
m_isResource(false) { m_isResource(false) {
// note this is nearly atomic ... (but it is enough) // note this is nearly atomic ... (but it is enough)
m_uniqueId = m_valUID++; m_uniqueId = m_valUID++;
@ -70,7 +70,7 @@ void ewol::Object::init() {
void ewol::Object::init(const std::string& _name) { void ewol::Object::init(const std::string& _name) {
init(); init();
m_name = _name; propertyName.set(_name);
} }
const char * const ewol::Object::getObjectType() { const char * const ewol::Object::getObjectType() {
@ -159,7 +159,7 @@ std::shared_ptr<ewol::Object> ewol::Object::getObjectNamed(const std::string& _o
} }
std::shared_ptr<ewol::Object> ewol::Object::getSubObjectNamed(const std::string& _objectName) { std::shared_ptr<ewol::Object> ewol::Object::getSubObjectNamed(const std::string& _objectName) {
if (_objectName == m_name.get()) { if (_objectName == propertyName.get()) {
return shared_from_this(); return shared_from_this();
} }
return nullptr; return nullptr;

5
ewol/translate.cpp
View File

@ -105,7 +105,10 @@ class LocalInstanceTranslation {
const std::string& get(const std::string& _instance) { const std::string& get(const std::string& _instance) {
loadTranslation(); loadTranslation();
auto it = m_translate.find(_instance); if (etk::start_with(_instance, "TRANSLATE:") == false) {
return _instance;
}
auto it = m_translate.find(std::string(_instance.begin() + 9, _instance.end()));
if (it == m_translate.end()) { if (it == m_translate.end()) {
EWOL_DEBUG("Can not find tranlation : '" << _instance << "'"); EWOL_DEBUG("Can not find tranlation : '" << _instance << "'");
return _instance; return _instance;

115
ewol/widget/Button.cpp
View File

@ -14,11 +14,11 @@
#define __class__ "Button" #define __class__ "Button"
// DEFINE for the shader display system : // DEFINE for the shader display system:
#define STATUS_UP (0) const static int32_t STATUS_UP(0);
#define STATUS_HOVER (2) const static int32_t STATUS_HOVER(2);
#define STATUS_PRESSED (1) const static int32_t STATUS_PRESSED(1);
#define STATUS_DOWN (3) const static int32_t STATUS_DOWN(3);
ewol::widget::Button::Button() : ewol::widget::Button::Button() :
signalPressed(*this, "pressed", "Button is pressed"), signalPressed(*this, "pressed", "Button is pressed"),
@ -27,11 +27,11 @@ ewol::widget::Button::Button() :
signalEnter(*this, "enter", "The cursor enter inside the button"), signalEnter(*this, "enter", "The cursor enter inside the button"),
signalLeave(*this, "leave", "the cursor leave the button"), signalLeave(*this, "leave", "the cursor leave the button"),
signalValue(*this, "value", "button value change"), signalValue(*this, "value", "button value change"),
m_shaper(*this, "shaper", "The display name for config file"), propertyShape(*this, "shaper", "", "The display name for config file"),
m_value(*this, "value", false, "Value of the Button"), propertyValue(*this, "value", false, "Value of the Button"),
m_lock(*this, "lock", lockNone, "Lock the button in a special state to permit changing state only by the coder"), propertyLock(*this, "lock", lockNone, "Lock the button in a special state to permit changing state only by the coder"),
m_toggleMode(*this, "toggle", false, "The Button can toogle"), propertyToggleMode(*this, "toggle", false, "The Button can toogle"),
m_enableSingle(*this, "enable-single", false, "If one element set in the Button ==> display only set"), propertyEnableSingle(*this, "enable-single", false, "If one element set in the Button ==> display only set"),
m_mouseHover(false), m_mouseHover(false),
m_buttonPressed(false), m_buttonPressed(false),
m_selectableAreaPos(0,0), m_selectableAreaPos(0,0),
@ -39,31 +39,29 @@ ewol::widget::Button::Button() :
addObjectType("ewol::widget::Button"); addObjectType("ewol::widget::Button");
// set property list: // set property list:
m_lock.add(lockNone, "none"); propertyLock.add(lockNone, "none");
m_lock.add(lockWhenPressed, "pressed"); propertyLock.add(lockWhenPressed, "pressed");
m_lock.add(lockWhenReleased, "released"); propertyLock.add(lockWhenReleased, "released");
m_lock.add(lockAccess, "access"); propertyLock.add(lockAccess, "access");
// shaper satatus update: // shaper satatus update:
CheckStatus(); CheckStatus();
// This widget can have the focus ...
setCanHaveFocus(true);
// Limit event at 1: // Limit event at 1:
setMouseLimit(1); setMouseLimit(1);
} }
void ewol::widget::Button::init(const std::string& _shaperName) { void ewol::widget::Button::init(const std::string& _shaperName) {
ewol::widget::Container2::init(); ewol::widget::Container2::init();
m_shaper->setSource(_shaperName); propertyCanFocus.set(true);
propertyShape.set(_shaperName);
} }
ewol::widget::Button::~Button() { ewol::widget::Button::~Button() {
} }
void ewol::widget::Button::onChangeSize() { void ewol::widget::Button::onChangeSize() {
ewol::Padding padding = m_shaper->getPadding(); ewol::Padding padding = m_shaper.getPadding();
ewol::Padding ret = onChangeSizePadded(padding); ewol::Padding ret = onChangeSizePadded(padding);
//EWOL_DEBUG(" configuring : origin=" << origin << " size=" << subElementSize << ""); //EWOL_DEBUG(" configuring : origin=" << origin << " size=" << subElementSize << "");
m_selectableAreaPos = vec2(ret.xLeft(), ret.yButtom()); m_selectableAreaPos = vec2(ret.xLeft(), ret.yButtom());
@ -72,13 +70,13 @@ void ewol::widget::Button::onChangeSize() {
void ewol::widget::Button::calculateMinMaxSize() { void ewol::widget::Button::calculateMinMaxSize() {
ewol::Padding padding = m_shaper->getPadding(); ewol::Padding padding = m_shaper.getPadding();
calculateMinMaxSizePadded(padding); calculateMinMaxSizePadded(padding);
} }
void ewol::widget::Button::onDraw() { void ewol::widget::Button::onDraw() {
// draw the shaaper (if needed indeed) // draw the shaaper (if needed indeed)
m_shaper->draw(); m_shaper.draw();
} }
void ewol::widget::Button::onRegenerateDisplay() { void ewol::widget::Button::onRegenerateDisplay() {
@ -86,8 +84,8 @@ void ewol::widget::Button::onRegenerateDisplay() {
if (needRedraw() == false) { if (needRedraw() == false) {
return; return;
} }
ewol::Padding padding = m_shaper->getPadding(); ewol::Padding padding = m_shaper.getPadding();
m_shaper->setShape(vec2(0,0), m_shaper.setShape(vec2(0,0),
m_size, m_size,
vec2ClipInt32(m_selectableAreaPos+vec2(padding.xLeft(),padding.yButtom()) ), vec2ClipInt32(m_selectableAreaPos+vec2(padding.xLeft(),padding.yButtom()) ),
vec2ClipInt32(m_selectableAreaSize-vec2(padding.x(),padding.y()) ) ); vec2ClipInt32(m_selectableAreaSize-vec2(padding.x(),padding.y()) ) );
@ -97,7 +95,7 @@ void ewol::widget::Button::onRegenerateDisplay() {
bool ewol::widget::Button::onEventInput(const ewol::event::Input& _event) { bool ewol::widget::Button::onEventInput(const ewol::event::Input& _event) {
EWOL_VERBOSE("Event on BT : " << _event); EWOL_VERBOSE("Event on BT : " << _event);
// disable event in the lock access mode : // disable event in the lock access mode :
if(ewol::widget::Button::lockAccess == m_lock) { if(ewol::widget::Button::lockAccess == propertyLock) {
return false; return false;
} }
if( gale::key::status_leave == _event.getStatus() if( gale::key::status_leave == _event.getStatus()
@ -121,36 +119,36 @@ bool ewol::widget::Button::onEventInput(const ewol::event::Input& _event) {
if (true == m_mouseHover) { if (true == m_mouseHover) {
if (1 == _event.getId()) { if (1 == _event.getId()) {
if(gale::key::status_down == _event.getStatus()) { if(gale::key::status_down == _event.getStatus()) {
EWOL_VERBOSE(getName() << " : Generate event : " << signalDown); EWOL_VERBOSE(propertyName.get() << " : Generate event : " << signalDown);
signalDown.emit(); signalDown.emit();
m_buttonPressed = true; m_buttonPressed = true;
markToRedraw(); markToRedraw();
} }
if(gale::key::status_up == _event.getStatus()) { if(gale::key::status_up == _event.getStatus()) {
EWOL_VERBOSE(getName() << " : Generate event : " << signalUp); EWOL_VERBOSE(propertyName.get() << " : Generate event : " << signalUp);
signalUp.emit(); signalUp.emit();
m_buttonPressed = false; m_buttonPressed = false;
markToRedraw(); markToRedraw();
} }
if(gale::key::status_single == _event.getStatus()) { if(gale::key::status_single == _event.getStatus()) {
if( ( m_value.get() == true if( ( propertyValue.get() == true
&& ewol::widget::Button::lockWhenPressed == m_lock) && ewol::widget::Button::lockWhenPressed == propertyLock)
|| ( m_value.get() == false || ( propertyValue.get() == false
&& ewol::widget::Button::lockWhenReleased == m_lock) ) { && ewol::widget::Button::lockWhenReleased == propertyLock) ) {
// nothing to do : Lock mode ... // nothing to do : Lock mode ...
// user might set himself the new correct value with @ref setValue(xxx) // user might set himself the new correct value with @ref setValue(xxx)
} else { } else {
// inverse value : // inverse value :
setValue((m_value.get())?false:true); propertyValue.set((propertyValue.get())?false:true);
EWOL_VERBOSE(getName() << " : Generate event : " << signalPressed); EWOL_VERBOSE(propertyName.get() << " : Generate event : " << signalPressed);
signalPressed.emit(); signalPressed.emit();
EWOL_VERBOSE(getName() << " : Generate event : " << signalValue << " val=" << m_value ); EWOL_VERBOSE(propertyName.get() << " : Generate event : " << signalValue << " val=" << propertyValue );
signalValue.emit(m_value.get()); signalValue.emit(propertyValue.get());
if( m_toggleMode.get() == false if( propertyToggleMode.get() == false
&& m_value.get() == true) { && propertyValue.get() == true) {
setValue(false); propertyValue.set(false);
EWOL_VERBOSE(getName() << " : Generate event : " << signalValue << " val=" << m_value); EWOL_VERBOSE(propertyName.get() << " : Generate event : " << signalValue << " val=" << propertyValue);
signalValue.emit(m_value.get()); signalValue.emit(propertyValue.get());
} }
} }
markToRedraw(); markToRedraw();
@ -175,7 +173,7 @@ bool ewol::widget::Button::onEventEntry(const ewol::event::Entry& _event) {
void ewol::widget::Button::onLostFocus() { void ewol::widget::Button::onLostFocus() {
m_buttonPressed = false; m_buttonPressed = false;
EWOL_VERBOSE(getName() << " : Remove Focus ..."); EWOL_VERBOSE(propertyName.get() << " : Remove Focus ...");
CheckStatus(); CheckStatus();
} }
@ -188,14 +186,14 @@ void ewol::widget::Button::CheckStatus() {
changeStatusIn(STATUS_HOVER); changeStatusIn(STATUS_HOVER);
return; return;
} }
if (m_value == true) { if (propertyValue == true) {
changeStatusIn(STATUS_DOWN); changeStatusIn(STATUS_DOWN);
} }
changeStatusIn(STATUS_UP); changeStatusIn(STATUS_UP);
} }
void ewol::widget::Button::changeStatusIn(int32_t _newStatusId) { void ewol::widget::Button::changeStatusIn(int32_t _newStatusId) {
if (m_shaper->changeStatusIn(_newStatusId) == true) { if (m_shaper.changeStatusIn(_newStatusId) == true) {
periodicCallEnable(); periodicCallEnable();
markToRedraw(); markToRedraw();
} }
@ -203,7 +201,7 @@ void ewol::widget::Button::changeStatusIn(int32_t _newStatusId) {
void ewol::widget::Button::periodicCall(const ewol::event::Time& _event) { void ewol::widget::Button::periodicCall(const ewol::event::Time& _event) {
if (m_shaper->periodicCall(_event) == false) { if (m_shaper.periodicCall(_event) == false) {
periodicCallDisable(); periodicCallDisable();
} }
markToRedraw(); markToRedraw();
@ -211,17 +209,18 @@ void ewol::widget::Button::periodicCall(const ewol::event::Time& _event) {
void ewol::widget::Button::onPropertyChangeValue(const eproperty::Ref& _paramPointer) { void ewol::widget::Button::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::widget::Container2::onPropertyChangeValue(_paramPointer); ewol::widget::Container2::onPropertyChangeValue(_paramPointer);
if (_paramPointer == m_shaper) { if (_paramPointer == propertyShape) {
m_shaper.setSource(propertyShape.get());
markToRedraw(); markToRedraw();
} else if (_paramPointer == m_value) { } else if (_paramPointer == propertyValue) {
if (m_toggleMode == true) { if (propertyToggleMode == true) {
if (m_value.get() == false) { if (propertyValue.get() == false) {
m_idWidgetDisplayed = 0; m_idWidgetDisplayed = 0;
} else { } else {
m_idWidgetDisplayed = 1; m_idWidgetDisplayed = 1;
} }
} }
if (m_enableSingle == true) { if (propertyEnableSingle == true) {
if ( m_idWidgetDisplayed == 0 if ( m_idWidgetDisplayed == 0
&& m_subWidget[0] == nullptr && m_subWidget[0] == nullptr
&& m_subWidget[1] != nullptr) { && m_subWidget[1] != nullptr) {
@ -234,28 +233,28 @@ void ewol::widget::Button::onPropertyChangeValue(const eproperty::Ref& _paramPoi
} }
CheckStatus(); CheckStatus();
markToRedraw(); markToRedraw();
} else if (_paramPointer == m_lock) { } else if (_paramPointer == propertyLock) {
if(ewol::widget::Button::lockAccess == m_lock.get()) { if(ewol::widget::Button::lockAccess == propertyLock.get()) {
m_buttonPressed = false; m_buttonPressed = false;
m_mouseHover = false; m_mouseHover = false;
} }
CheckStatus(); CheckStatus();
markToRedraw(); markToRedraw();
} else if (_paramPointer == m_toggleMode) { } else if (_paramPointer == propertyToggleMode) {
if (m_value.get() == true) { if (propertyValue.get() == true) {
m_value.get() = false; propertyValue.get() = false;
// TODO : change display and send event ... // TODO : change display and send event ...
} }
if (m_toggleMode.get() == false) { if (propertyToggleMode.get() == false) {
m_idWidgetDisplayed = 0; m_idWidgetDisplayed = 0;
} else { } else {
if (m_value.get() == false) { if (propertyValue.get() == false) {
m_idWidgetDisplayed = 0; m_idWidgetDisplayed = 0;
} else { } else {
m_idWidgetDisplayed = 1; m_idWidgetDisplayed = 1;
} }
} }
if (m_enableSingle.get() == true) { if (propertyEnableSingle.get() == true) {
if ( m_idWidgetDisplayed == 0 if ( m_idWidgetDisplayed == 0
&& m_subWidget[0] == nullptr && m_subWidget[0] == nullptr
&& m_subWidget[1] != nullptr) { && m_subWidget[1] != nullptr) {
@ -268,8 +267,8 @@ void ewol::widget::Button::onPropertyChangeValue(const eproperty::Ref& _paramPoi
} }
CheckStatus(); CheckStatus();
markToRedraw(); markToRedraw();
} else if (_paramPointer == m_enableSingle) { } else if (_paramPointer == propertyEnableSingle) {
if (m_enableSingle == true) { if (propertyEnableSingle == true) {
if ( m_idWidgetDisplayed == 0 if ( m_idWidgetDisplayed == 0
&& m_subWidget[0] == nullptr && m_subWidget[0] == nullptr
&& m_subWidget[1] != nullptr) { && m_subWidget[1] != nullptr) {

11
ewol/widget/Button.h
View File

@ -40,7 +40,7 @@ namespace ewol {
esignal::Signal<void> signalLeave; esignal::Signal<void> signalLeave;
esignal::Signal<bool> signalValue; esignal::Signal<bool> signalValue;
public: // propertie list public: // propertie list
eproperty::Value<std::string> propertyShaper; //!< shaper name property eproperty::Value<std::string> propertyShape; //!< shaper name property
eproperty::Value<bool> propertyValue; //!< Current state of the button. eproperty::Value<bool> propertyValue; //!< Current state of the button.
eproperty::List<enum buttonLock> propertyLock; //!< Current lock state of the button. eproperty::List<enum buttonLock> propertyLock; //!< Current lock state of the button.
eproperty::Value<bool> propertyToggleMode; //!< The button is able to toggle. eproperty::Value<bool> propertyToggleMode; //!< The button is able to toggle.
@ -60,13 +60,6 @@ namespace ewol {
* @brief Destructor * @brief Destructor
*/ */
virtual ~Button(); virtual ~Button();
/**
* @brief set the shaper name (use the contructer one this permit to not noad unused shaper)
* @param[in] _shaperName The new shaper filename
*/
void setShaperName(const std::string& _shaperName) {
m_shaper.setString(_shaperName);
}
private: private:
bool m_mouseHover; //!< Flag to know where the mouse is (inside the displayed widget (if not fill)). bool m_mouseHover; //!< Flag to know where the mouse is (inside the displayed widget (if not fill)).
bool m_buttonPressed; //!< Flag to know if the button is curently pressed. bool m_buttonPressed; //!< Flag to know if the button is curently pressed.
@ -93,7 +86,7 @@ namespace ewol {
virtual bool onEventInput(const ewol::event::Input& _event); virtual bool onEventInput(const ewol::event::Input& _event);
virtual bool onEventEntry(const ewol::event::Entry& _event); virtual bool onEventEntry(const ewol::event::Entry& _event);
virtual void onDetectPresenceToggleWidget() { virtual void onDetectPresenceToggleWidget() {
setToggleMode(true); propertyToggleMode.set(true);
} }
private: // derived function private: // derived function
virtual void periodicCall(const ewol::event::Time& _event); virtual void periodicCall(const ewol::event::Time& _event);

49
ewol/widget/ButtonColor.cpp
View File

@ -29,34 +29,29 @@ static const char* const eventColorHasChange = "ewol-widget-ButtonColor-colorCha
ewol::widget::ButtonColor::ButtonColor() : ewol::widget::ButtonColor::ButtonColor() :
signalChange(*this, "change", "Button color change value"), signalChange(*this, "change", "Button color change value"),
m_widgetContextMenu(nullptr), propertyValue(*this, "color", etk::color::black, "Current color"),
m_textColorFg(*this, "color", etk::color::black, "Current color") { propertyShape(*this, "shape", "", "shape of the widget"),
m_widgetContextMenu(nullptr) {
addObjectType("ewol::widget::ButtonColor"); addObjectType("ewol::widget::ButtonColor");
changeStatusIn(STATUS_UP); changeStatusIn(STATUS_UP);
setCanHaveFocus(true);
// Limit event at 1: // Limit event at 1:
setMouseLimit(1); setMouseLimit(1);
} }
void ewol::widget::ButtonColor::init(etk::Color<> _baseColor, std::string _shaperName) { void ewol::widget::ButtonColor::init(etk::Color<> _baseColor, std::string _shaperName) {
ewol::Widget::init(); ewol::Widget::init();
m_shaper.setSource(_shaperName); propertyCanFocus.set(true);
m_textColorFg.set(_baseColor); propertyShape.set(_shaperName);
propertyValue.set(_baseColor);
} }
ewol::widget::ButtonColor::~ButtonColor() { ewol::widget::ButtonColor::~ButtonColor() {
} }
void ewol::widget::ButtonColor::setShaperName(std::string _shaperName) {
m_shaper.setSource(_shaperName);
}
void ewol::widget::ButtonColor::calculateMinMaxSize() { void ewol::widget::ButtonColor::calculateMinMaxSize() {
ewol::Padding padding = m_shaper.getPadding(); ewol::Padding padding = m_shaper.getPadding();
std::string label = m_textColorFg.getString(); std::string label = propertyValue.getString();
vec3 minSize = m_text.calculateSize(label); vec3 minSize = m_text.calculateSize(label);
m_minSize.setX(padding.x()*2 + minSize.x() + 7); m_minSize.setX(padding.x()*2 + minSize.x() + 7);
m_minSize.setY(padding.y()*2 + minSize.y() ); m_minSize.setY(padding.y()*2 + minSize.y() );
@ -81,7 +76,7 @@ void ewol::widget::ButtonColor::onRegenerateDisplay() {
ewol::Padding padding = m_shaper.getPadding(); ewol::Padding padding = m_shaper.getPadding();
std::string label = m_textColorFg.getString(); std::string label = propertyValue.getString();
ivec2 localSize = m_minSize; ivec2 localSize = m_minSize;
@ -93,12 +88,12 @@ void ewol::widget::ButtonColor::onRegenerateDisplay() {
(m_size.y() - m_minSize.y()) / 2.0, (m_size.y() - m_minSize.y()) / 2.0,
0); 0);
if (true == m_userFill->x()) { if (propertyFill->x() == true) {
localSize.setX(m_size.x()); localSize.setX(m_size.x());
tmpOrigin.setX(0); tmpOrigin.setX(0);
tmpTextOrigin.setX(0); tmpTextOrigin.setX(0);
} }
if (true == m_userFill->y()) { if (propertyFill->y() == true) {
localSize.setY(m_size.y()); localSize.setY(m_size.y());
} }
tmpOrigin += vec3(padding.xLeft(), padding.yButtom(), 0); tmpOrigin += vec3(padding.xLeft(), padding.yButtom(), 0);
@ -107,20 +102,20 @@ void ewol::widget::ButtonColor::onRegenerateDisplay() {
// clean the element // clean the element
m_text.reset(); m_text.reset();
if( m_textColorFg.get().r() < 100 if( propertyValue.get().r() < 100
|| m_textColorFg.get().g() < 100 || propertyValue.get().g() < 100
|| m_textColorFg.get().b() < 100) { || propertyValue.get().b() < 100) {
m_text.setColor(etk::color::white); m_text.setColor(etk::color::white);
} else { } else {
m_text.setColor(etk::color::black); m_text.setColor(etk::color::black);
} }
m_text.setPos(tmpTextOrigin); m_text.setPos(tmpTextOrigin);
m_text.setColorBg(m_textColorFg.get()); m_text.setColorBg(propertyValue.get());
m_text.setTextAlignement(tmpTextOrigin.x(), tmpTextOrigin.x()+localSize.x(), ewol::compositing::alignCenter); m_text.setTextAlignement(tmpTextOrigin.x(), tmpTextOrigin.x()+localSize.x(), ewol::compositing::alignCenter);
m_text.print(label); m_text.print(label);
if (true == m_userFill->y()) { if (propertyFill->y() == true) {
tmpOrigin.setY(padding.yButtom()); tmpOrigin.setY(padding.yButtom());
} }
@ -179,7 +174,7 @@ bool ewol::widget::ButtonColor::onEventInput(const ewol::event::Input& _event) {
m_widgetContextMenu->setPositionMark(ewol::widget::ContextMenu::markButtom, tmpPos ); m_widgetContextMenu->setPositionMark(ewol::widget::ContextMenu::markButtom, tmpPos );
std::shared_ptr<ewol::widget::ColorChooser> myColorChooser = widget::ColorChooser::create(); std::shared_ptr<ewol::widget::ColorChooser> myColorChooser = widget::ColorChooser::create();
myColorChooser->setColor(m_textColorFg.get()); myColorChooser->propertyValue.set(propertyValue.get());
// set it in the pop-up-system : // set it in the pop-up-system :
m_widgetContextMenu->setSubWidget(myColorChooser); m_widgetContextMenu->setSubWidget(myColorChooser);
myColorChooser->signalChange.bind(shared_from_this(), &ewol::widget::ButtonColor::onCallbackColorChange); myColorChooser->signalChange.bind(shared_from_this(), &ewol::widget::ButtonColor::onCallbackColorChange);
@ -210,18 +205,18 @@ bool ewol::widget::ButtonColor::onEventInput(const ewol::event::Input& _event) {
} }
void ewol::widget::ButtonColor::onCallbackColorChange(const etk::Color<>& _color) { void ewol::widget::ButtonColor::onCallbackColorChange(const etk::Color<>& _color) {
setValue(_color); propertyValue.set(_color);
} }
void ewol::widget::ButtonColor::changeStatusIn(int32_t _newStatusId) { void ewol::widget::ButtonColor::changeStatusIn(int32_t _newStatusId) {
if (true == m_shaper.changeStatusIn(_newStatusId) ) { if (m_shaper.changeStatusIn(_newStatusId) == true) {
periodicCallEnable(); periodicCallEnable();
markToRedraw(); markToRedraw();
} }
} }
void ewol::widget::ButtonColor::periodicCall(const ewol::event::Time& _event) { void ewol::widget::ButtonColor::periodicCall(const ewol::event::Time& _event) {
if (false == m_shaper.periodicCall(_event) ) { if (m_shaper.periodicCall(_event) == false) {
periodicCallDisable(); periodicCallDisable();
} }
markToRedraw(); markToRedraw();
@ -230,8 +225,10 @@ void ewol::widget::ButtonColor::periodicCall(const ewol::event::Time& _event) {
void ewol::widget::ButtonColor::onPropertyChangeValue(const eproperty::Ref& _paramPointer) { void ewol::widget::ButtonColor::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::Widget::onPropertyChangeValue(_paramPointer); ewol::Widget::onPropertyChangeValue(_paramPointer);
if (_paramPointer == m_textColorFg) { if (_paramPointer == propertyValue) {
signalChange.emit(m_textColorFg); signalChange.emit(propertyValue);
} else if (_paramPointer == propertyShape) {
m_shaper.setSource(propertyShape.get());
markToRedraw(); markToRedraw();
} }
} }

8
ewol/widget/ButtonColor.h
View File

@ -23,7 +23,8 @@ namespace ewol {
public: // signals public: // signals
esignal::Signal<etk::Color<>> signalChange; esignal::Signal<etk::Color<>> signalChange;
public: // properties public: // properties
eproperty::Value<etk::Color<>> m_textColorFg; //!< Current color. eproperty::Value<etk::Color<>> propertyValue; //!< Current color.
eproperty::Value<std::string> propertyShape; //!< Current color.
private: private:
ewol::compositing::Shaper m_shaper; //!< Compositing theme. ewol::compositing::Shaper m_shaper; //!< Compositing theme.
ewol::compositing::Text m_text; //!< Compositing Test display. ewol::compositing::Text m_text; //!< Compositing Test display.
@ -47,11 +48,6 @@ namespace ewol {
* @brief Main destructor. * @brief Main destructor.
*/ */
virtual ~ButtonColor(); virtual ~ButtonColor();
/**
* @brief set the shaper name (use the contructer one this permit to not noad unused shaper).
* @param[in] _shaperName The new shaper filename.
*/
void setShaperName(std::string _shaperName);
protected: // Derived function protected: // Derived function
virtual void onDraw(); virtual void onDraw();
public: // Derived function public: // Derived function

63
ewol/widget/CheckBox.cpp
View File

@ -25,20 +25,17 @@ ewol::widget::CheckBox::CheckBox() :
signalUp(*this, "up", "CheckBox is UP"), signalUp(*this, "up", "CheckBox is UP"),
signalEnter(*this, "enter", "The cursor enter inside the CheckBox"), signalEnter(*this, "enter", "The cursor enter inside the CheckBox"),
signalValue(*this, "value", "CheckBox value change"), signalValue(*this, "value", "CheckBox value change"),
propertyshaper(*this, "shaper", "The display name for config file"), propertyValue(*this, "value", false, "Basic value of the widget"),
m_shaper(*this, "shaper", "The display name for config file"), propertyShape(*this, "shape", "", "The display name for config file"),
m_mouseHover(false), m_mouseHover(false),
m_buttonPressed(false), m_buttonPressed(false),
m_selectableAreaPos(0,0), m_selectableAreaPos(0,0),
m_selectableAreaSize(0,0), m_selectableAreaSize(0,0),
m_shaperIdSize(-1), m_shaperIdSize(-1),
m_shaperIdSizeInsize(-1), m_shaperIdSizeInsize(-1) {
m_value(*this, "value", false, "Basic value of the widget") {
addObjectType("ewol::widget::CheckBox"); addObjectType("ewol::widget::CheckBox");
// shaper satatus update: // shaper satatus update:
CheckStatus(); CheckStatus();
// This widget can have the focus ...
setCanHaveFocus(true);
// Limit event at 1: // Limit event at 1:
setMouseLimit(1); setMouseLimit(1);
} }
@ -46,9 +43,10 @@ ewol::widget::CheckBox::CheckBox() :
void ewol::widget::CheckBox::init(const std::string& _shaperName) { void ewol::widget::CheckBox::init(const std::string& _shaperName) {
ewol::widget::Container2::init(); ewol::widget::Container2::init();
m_shaper->setSource(_shaperName); propertyCanFocus.set(true);
m_shaperIdSize = m_shaper->requestConfig("box-size"); propertyShape.set(_shaperName);
m_shaperIdSizeInsize = m_shaper->requestConfig("box-inside"); m_shaperIdSize = m_shaper.requestConfig("box-size");
m_shaperIdSizeInsize = m_shaper.requestConfig("box-inside");
} }
ewol::widget::CheckBox::~CheckBox() { ewol::widget::CheckBox::~CheckBox() {
@ -56,8 +54,8 @@ ewol::widget::CheckBox::~CheckBox() {
} }
void ewol::widget::CheckBox::onChangeSize() { void ewol::widget::CheckBox::onChangeSize() {
ewol::Padding padding = m_shaper->getPadding(); ewol::Padding padding = m_shaper.getPadding();
float boxSize = m_shaper->getConfigNumber(m_shaperIdSize); float boxSize = m_shaper.getConfigNumber(m_shaperIdSize);
padding.setXLeft(padding.xLeft()*2.0f + boxSize); padding.setXLeft(padding.xLeft()*2.0f + boxSize);
ewol::Padding ret = onChangeSizePadded(padding); ewol::Padding ret = onChangeSizePadded(padding);
EWOL_DEBUG(" configuring : padding=" << padding << " boxSize=" << boxSize << ""); EWOL_DEBUG(" configuring : padding=" << padding << " boxSize=" << boxSize << "");
@ -66,8 +64,8 @@ void ewol::widget::CheckBox::onChangeSize() {
} }
void ewol::widget::CheckBox::calculateMinMaxSize() { void ewol::widget::CheckBox::calculateMinMaxSize() {
ewol::Padding padding = m_shaper->getPadding(); ewol::Padding padding = m_shaper.getPadding();
float boxSize = m_shaper->getConfigNumber(m_shaperIdSize); float boxSize = m_shaper.getConfigNumber(m_shaperIdSize);
padding.setXLeft(padding.xLeft()*2.0f + boxSize); padding.setXLeft(padding.xLeft()*2.0f + boxSize);
calculateMinMaxSizePadded(padding); calculateMinMaxSizePadded(padding);
if (m_minSize.y() < padding.y()+boxSize) { if (m_minSize.y() < padding.y()+boxSize) {
@ -77,7 +75,7 @@ void ewol::widget::CheckBox::calculateMinMaxSize() {
void ewol::widget::CheckBox::onDraw() { void ewol::widget::CheckBox::onDraw() {
// draw the shaaper (if needed indeed) // draw the shaaper (if needed indeed)
m_shaper->draw(); m_shaper.draw();
} }
void ewol::widget::CheckBox::onRegenerateDisplay() { void ewol::widget::CheckBox::onRegenerateDisplay() {
@ -85,17 +83,17 @@ void ewol::widget::CheckBox::onRegenerateDisplay() {
if (needRedraw() == false) { if (needRedraw() == false) {
return; return;
} }
ewol::Padding padding = m_shaper->getPadding(); ewol::Padding padding = m_shaper.getPadding();
float boxSize = m_shaper->getConfigNumber(m_shaperIdSize); float boxSize = m_shaper.getConfigNumber(m_shaperIdSize);
float boxInside = m_shaper->getConfigNumber(m_shaperIdSizeInsize); float boxInside = m_shaper.getConfigNumber(m_shaperIdSizeInsize);
m_shaper->clear(); m_shaper.clear();
EWOL_DEBUG(" configuring : boxSize=" << boxSize << " boxInside=" << boxInside << ""); EWOL_DEBUG(" configuring : boxSize=" << boxSize << " boxInside=" << boxInside << "");
vec2 origin(m_selectableAreaPos + vec2(0, (m_selectableAreaSize.y() - (boxSize+padding.y()))*0.5f)); vec2 origin(m_selectableAreaPos + vec2(0, (m_selectableAreaSize.y() - (boxSize+padding.y()))*0.5f));
vec2 size = vec2(boxSize+padding.x(), boxSize+padding.y()); vec2 size = vec2(boxSize+padding.x(), boxSize+padding.y());
vec2 origin2 = m_selectableAreaPos + vec2((boxSize-boxInside)*0.5f, (m_selectableAreaSize.y() - (boxInside+padding.y()))*0.5f); vec2 origin2 = m_selectableAreaPos + vec2((boxSize-boxInside)*0.5f, (m_selectableAreaSize.y() - (boxInside+padding.y()))*0.5f);
vec2 size2 = vec2(boxInside+padding.x(), boxInside+padding.y()); vec2 size2 = vec2(boxInside+padding.x(), boxInside+padding.y());
m_shaper->setShape(vec2ClipInt32(origin), m_shaper.setShape(vec2ClipInt32(origin),
vec2ClipInt32(size), vec2ClipInt32(size),
vec2ClipInt32(origin2+vec2(padding.xLeft(),padding.yButtom()) ), vec2ClipInt32(origin2+vec2(padding.xLeft(),padding.yButtom()) ),
vec2ClipInt32(size2-vec2(padding.x(),padding.y()) )); vec2ClipInt32(size2-vec2(padding.x(),padding.y()) ));
@ -127,24 +125,24 @@ bool ewol::widget::CheckBox::onEventInput(const ewol::event::Input& _event) {
if (true == m_mouseHover) { if (true == m_mouseHover) {
if (1 == _event.getId()) { if (1 == _event.getId()) {
if(gale::key::status_down == _event.getStatus()) { if(gale::key::status_down == _event.getStatus()) {
EWOL_VERBOSE(getName() << " : Generate event : " << signalDown); EWOL_VERBOSE(propertyName.get() << " : Generate event : " << signalDown);
signalDown.emit(); signalDown.emit();
m_buttonPressed = true; m_buttonPressed = true;
markToRedraw(); markToRedraw();
} }
if(gale::key::status_up == _event.getStatus()) { if(gale::key::status_up == _event.getStatus()) {
EWOL_VERBOSE(getName() << " : Generate event : " << signalUp); EWOL_VERBOSE(propertyName.get() << " : Generate event : " << signalUp);
signalUp.emit(); signalUp.emit();
m_buttonPressed = false; m_buttonPressed = false;
markToRedraw(); markToRedraw();
} }
if(gale::key::status_single == _event.getStatus()) { if(gale::key::status_single == _event.getStatus()) {
// inverse value : // inverse value :
setValue((m_value)?false:true); propertyValue.set((propertyValue.get())?false:true);
EWOL_VERBOSE(getName() << " : Generate event : " << signalPressed); EWOL_VERBOSE(propertyName.get() << " : Generate event : " << signalPressed);
signalPressed.emit(); signalPressed.emit();
EWOL_VERBOSE(getName() << " : Generate event : " << signalValue << " val=" << m_value ); EWOL_VERBOSE(propertyName.get() << " : Generate event : " << signalValue << " val=" << propertyValue );
signalValue.emit(m_value.get()); signalValue.emit(propertyValue.get());
markToRedraw(); markToRedraw();
} }
} }
@ -169,7 +167,7 @@ bool ewol::widget::CheckBox::onEventEntry(const ewol::event::Entry& _event) {
} }
void ewol::widget::CheckBox::CheckStatus() { void ewol::widget::CheckBox::CheckStatus() {
if (m_shaper->setState(m_value==true?1:0) == true) { if (m_shaper.setState(propertyValue==true?1:0) == true) {
markToRedraw(); markToRedraw();
} }
if (m_buttonPressed == true) { if (m_buttonPressed == true) {
@ -187,7 +185,7 @@ void ewol::widget::CheckBox::CheckStatus() {
} }
void ewol::widget::CheckBox::changeStatusIn(int32_t _newStatusId) { void ewol::widget::CheckBox::changeStatusIn(int32_t _newStatusId) {
if (m_shaper->changeStatusIn(_newStatusId) == true) { if (m_shaper.changeStatusIn(_newStatusId) == true) {
periodicCallEnable(); periodicCallEnable();
markToRedraw(); markToRedraw();
} }
@ -195,7 +193,7 @@ void ewol::widget::CheckBox::changeStatusIn(int32_t _newStatusId) {
void ewol::widget::CheckBox::periodicCall(const ewol::event::Time& _event) { void ewol::widget::CheckBox::periodicCall(const ewol::event::Time& _event) {
if (m_shaper->periodicCall(_event) == false) { if (m_shaper.periodicCall(_event) == false) {
periodicCallDisable(); periodicCallDisable();
} }
markToRedraw(); markToRedraw();
@ -203,16 +201,17 @@ void ewol::widget::CheckBox::periodicCall(const ewol::event::Time& _event) {
void ewol::widget::CheckBox::onPropertyChangeValue(const eproperty::Ref& _paramPointer) { void ewol::widget::CheckBox::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::widget::Container2::onPropertyChangeValue(_paramPointer); ewol::widget::Container2::onPropertyChangeValue(_paramPointer);
if (_paramPointer == m_shaper) { if (_paramPointer == propertyShape) {
m_shaper.setSource(propertyShape.get());
markToRedraw(); markToRedraw();
} else if (_paramPointer == m_value) { } else if (_paramPointer == propertyValue) {
if (m_value.get() == false) { if (propertyValue.get() == false) {
m_idWidgetDisplayed = convertId(0); m_idWidgetDisplayed = convertId(0);
} else { } else {
m_idWidgetDisplayed = convertId(1); m_idWidgetDisplayed = convertId(1);
} }
CheckStatus(); CheckStatus();
markToRedraw(); markToRedraw();
m_shaper->setActivateState(m_value==true?1:0); m_shaper.setActivateState(propertyValue==true?1:0);
} }
} }

2
ewol/widget/CheckBox.h
View File

@ -25,8 +25,8 @@ namespace ewol {
esignal::Signal<void> signalEnter; esignal::Signal<void> signalEnter;
esignal::Signal<bool> signalValue; esignal::Signal<bool> signalValue;
public: // propertie list public: // propertie list
eproperty::Value<std::string> propertyShaper;
eproperty::Value<bool> propertyValue; //!< Current state of the checkbox. eproperty::Value<bool> propertyValue; //!< Current state of the checkbox.
eproperty::Value<std::string> propertyShape; //!< shape of the widget
private: private:
ewol::compositing::Shaper m_shaper; //!< Compositing theme. ewol::compositing::Shaper m_shaper; //!< Compositing theme.
bool m_mouseHover; //!< Flag to know where the mouse is (inside the displayed widget (if not fill)). bool m_mouseHover; //!< Flag to know where the mouse is (inside the displayed widget (if not fill)).

214
ewol/widget/ColorBar.cpp
View File

@ -17,16 +17,16 @@
#define __class__ "ColorBar" #define __class__ "ColorBar"
ewol::widget::ColorBar::ColorBar() : ewol::widget::ColorBar::ColorBar() :
signalChange(*this, "change", "Color value change") { signalChange(*this, "change", "Color value change"),
propertyValue(*this, "color", etk::color::black, "Current color") {
addObjectType("ewol::widget::ColorBar"); addObjectType("ewol::widget::ColorBar");
m_currentUserPos.setValue(0,0); m_currentUserPos.setValue(0,0);
m_currentColor = etk::color::black;
setCanHaveFocus(true);
setMouseLimit(1); setMouseLimit(1);
} }
void ewol::widget::ColorBar::init() { void ewol::widget::ColorBar::init() {
ewol::Widget::init(); ewol::Widget::init();
propertyCanFocus.set(true);
} }
ewol::widget::ColorBar::~ColorBar() { ewol::widget::ColorBar::~ColorBar() {
@ -51,14 +51,14 @@ static etk::Color<> s_listColor[NB_BAND_COLOR+1] = {
etk::Color<>(0xFF, 0x00, 0xFF, 0xFF), etk::Color<>(0xFF, 0x00, 0xFF, 0xFF),
etk::Color<>(0xFF, 0x00, 0x00, 0xFF)}; etk::Color<>(0xFF, 0x00, 0x00, 0xFF)};
etk::Color<> ewol::widget::ColorBar::getCurrentColor() {
return m_currentColor; void ewol::widget::ColorBar::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
} ewol::Widget::onPropertyChangeValue(_paramPointer);
void ewol::widget::ColorBar::setCurrentColor(etk::Color<> newOne) { if (_paramPointer == propertyValue) {
m_currentColor = newOne; propertyValue.get().setA(0xFF);
m_currentColor.setA(0xFF); // estimate the cursor position:
// estimate the cursor position : EWOL_TODO("Later when really needed ...");
// TODO : Later when really needed ... }
} }
void ewol::widget::ColorBar::onDraw() { void ewol::widget::ColorBar::onDraw() {
@ -67,100 +67,100 @@ void ewol::widget::ColorBar::onDraw() {
void ewol::widget::ColorBar::onRegenerateDisplay() { void ewol::widget::ColorBar::onRegenerateDisplay() {
if (true == needRedraw()) { if (needRedraw() == true) {
// clean the object list ... return;
m_draw.clear();
int32_t tmpSizeX = m_minSize.x();
int32_t tmpSizeY = m_minSize.y();
int32_t tmpOriginX = (m_size.x() - m_minSize.x()) / 2;
int32_t tmpOriginY = (m_size.y() - m_minSize.y()) / 2;
if (true == m_userFill->x()) {
tmpSizeX = m_size.x();
tmpOriginX = 0;
}
if (true == m_userFill->y()) {
tmpSizeY = m_size.y();
tmpOriginY = 0;
}
for(int32_t iii=0; iii<NB_BAND_COLOR ; iii++) {
/* Step 1 :
*
* **
* ****
* ******
* ********
*/
m_draw.setColor(s_listColorWhite);
m_draw.setPos(vec3(tmpOriginX + (iii)*(tmpSizeX/NB_BAND_COLOR), tmpOriginY, 0) );
m_draw.addVertex();
m_draw.setColor(s_listColor[iii+1]);
m_draw.setPos(vec3(tmpOriginX + (iii+1)*(tmpSizeX/NB_BAND_COLOR), tmpOriginY+tmpSizeY/2, 0) );
m_draw.addVertex();
m_draw.setColor(s_listColor[iii]);
m_draw.setPos(vec3(tmpOriginX + iii*(tmpSizeX/NB_BAND_COLOR), tmpOriginY+tmpSizeY/2, 0) );
m_draw.addVertex();
/* Step 2 :
* ********
* ******
* ****
* **
*
*/
m_draw.setColor(s_listColorWhite);
m_draw.setPos(vec3(tmpOriginX + iii*(tmpSizeX/NB_BAND_COLOR), tmpOriginY, 0) );
m_draw.addVertex();
m_draw.setColor(s_listColorWhite);
m_draw.setPos(vec3(tmpOriginX + (iii+1)*(tmpSizeX/NB_BAND_COLOR), tmpOriginY, 0) );
m_draw.addVertex();
m_draw.setColor(s_listColor[iii+1]);
m_draw.setPos(vec3(tmpOriginX + (iii+1)*(tmpSizeX/NB_BAND_COLOR), tmpOriginY+tmpSizeY/2, 0) );
m_draw.addVertex();
/* Step 3 :
*
* **
* ****
* ******
* ********
*/
m_draw.setColor(s_listColor[iii]);
m_draw.setPos(vec3(tmpOriginX + iii*(tmpSizeX/NB_BAND_COLOR), tmpOriginY+tmpSizeY/2, 0));
m_draw.addVertex();
m_draw.setColor(s_listColorBlack);
m_draw.setPos(vec3(tmpOriginX + (iii+1)*(tmpSizeX/NB_BAND_COLOR), tmpOriginY+tmpSizeY, 0));
m_draw.addVertex();
m_draw.setColor(s_listColorBlack);
m_draw.setPos(vec3(tmpOriginX + iii*(tmpSizeX/NB_BAND_COLOR), tmpOriginY+tmpSizeY, 0));
m_draw.addVertex();
/* Step 4 :
* ********
* ******
* ****
* **
*
*/
m_draw.setColor(s_listColor[iii]);
m_draw.setPos(vec3(tmpOriginX + iii*(tmpSizeX/NB_BAND_COLOR), tmpOriginY+tmpSizeY/2, 0));
m_draw.addVertex();
m_draw.setColor(s_listColor[iii+1]);
m_draw.setPos(vec3(tmpOriginX + (iii+1)*(tmpSizeX/NB_BAND_COLOR), tmpOriginY+tmpSizeY/2, 0));
m_draw.addVertex();
m_draw.setColor(s_listColorBlack);
m_draw.setPos(vec3(tmpOriginX + (iii+1)*(tmpSizeX/NB_BAND_COLOR), tmpOriginY+tmpSizeY, 0));
m_draw.addVertex();
}
if (m_currentUserPos.y() > 0.5) {
m_draw.setColor(etk::color::white);
} else {
m_draw.setColor(etk::color::black);
}
m_draw.setPos(vec3(m_currentUserPos.x()*m_size.x(), m_currentUserPos.y()*m_size.y(), 0) );
m_draw.setThickness(1);
m_draw.circle(3.0);
} }
// clean the object list ...
m_draw.clear();
int32_t tmpSizeX = m_minSize.x();
int32_t tmpSizeY = m_minSize.y();
int32_t tmpOriginX = (m_size.x() - m_minSize.x()) / 2;
int32_t tmpOriginY = (m_size.y() - m_minSize.y()) / 2;
if (propertyFill->x() == true) {
tmpSizeX = m_size.x();
tmpOriginX = 0;
}
if (propertyFill->y() == true) {
tmpSizeY = m_size.y();
tmpOriginY = 0;
}
for(int32_t iii=0; iii<NB_BAND_COLOR ; iii++) {
/* Step 1 :
*
* **
* ****
* ******
* ********
*/
m_draw.setColor(s_listColorWhite);
m_draw.setPos(vec3(tmpOriginX + (iii)*(tmpSizeX/NB_BAND_COLOR), tmpOriginY, 0) );
m_draw.addVertex();
m_draw.setColor(s_listColor[iii+1]);
m_draw.setPos(vec3(tmpOriginX + (iii+1)*(tmpSizeX/NB_BAND_COLOR), tmpOriginY+tmpSizeY/2, 0) );
m_draw.addVertex();
m_draw.setColor(s_listColor[iii]);
m_draw.setPos(vec3(tmpOriginX + iii*(tmpSizeX/NB_BAND_COLOR), tmpOriginY+tmpSizeY/2, 0) );
m_draw.addVertex();
/* Step 2 :
* ********
* ******
* ****
* **
*
*/
m_draw.setColor(s_listColorWhite);
m_draw.setPos(vec3(tmpOriginX + iii*(tmpSizeX/NB_BAND_COLOR), tmpOriginY, 0) );
m_draw.addVertex();
m_draw.setColor(s_listColorWhite);
m_draw.setPos(vec3(tmpOriginX + (iii+1)*(tmpSizeX/NB_BAND_COLOR), tmpOriginY, 0) );
m_draw.addVertex();
m_draw.setColor(s_listColor[iii+1]);
m_draw.setPos(vec3(tmpOriginX + (iii+1)*(tmpSizeX/NB_BAND_COLOR), tmpOriginY+tmpSizeY/2, 0) );
m_draw.addVertex();
/* Step 3 :
*
* **
* ****
* ******
* ********
*/
m_draw.setColor(s_listColor[iii]);
m_draw.setPos(vec3(tmpOriginX + iii*(tmpSizeX/NB_BAND_COLOR), tmpOriginY+tmpSizeY/2, 0));
m_draw.addVertex();
m_draw.setColor(s_listColorBlack);
m_draw.setPos(vec3(tmpOriginX + (iii+1)*(tmpSizeX/NB_BAND_COLOR), tmpOriginY+tmpSizeY, 0));
m_draw.addVertex();
m_draw.setColor(s_listColorBlack);
m_draw.setPos(vec3(tmpOriginX + iii*(tmpSizeX/NB_BAND_COLOR), tmpOriginY+tmpSizeY, 0));
m_draw.addVertex();
/* Step 4 :
* ********
* ******
* ****
* **
*
*/
m_draw.setColor(s_listColor[iii]);
m_draw.setPos(vec3(tmpOriginX + iii*(tmpSizeX/NB_BAND_COLOR), tmpOriginY+tmpSizeY/2, 0));
m_draw.addVertex();
m_draw.setColor(s_listColor[iii+1]);
m_draw.setPos(vec3(tmpOriginX + (iii+1)*(tmpSizeX/NB_BAND_COLOR), tmpOriginY+tmpSizeY/2, 0));
m_draw.addVertex();
m_draw.setColor(s_listColorBlack);
m_draw.setPos(vec3(tmpOriginX + (iii+1)*(tmpSizeX/NB_BAND_COLOR), tmpOriginY+tmpSizeY, 0));
m_draw.addVertex();
}
if (m_currentUserPos.y() > 0.5) {
m_draw.setColor(etk::color::white);
} else {
m_draw.setColor(etk::color::black);
}
m_draw.setPos(vec3(m_currentUserPos.x()*m_size.x(), m_currentUserPos.y()*m_size.y(), 0) );
m_draw.setThickness(1);
m_draw.circle(3.0);
} }
@ -218,9 +218,9 @@ bool ewol::widget::ColorBar::onEventInput(const ewol::event::Input& _event) {
estimateColor.setG(estimateColor.g() - estimateColor.g()*poroportionnalBlack); estimateColor.setG(estimateColor.g() - estimateColor.g()*poroportionnalBlack);
estimateColor.setB(estimateColor.b() - estimateColor.b()*poroportionnalBlack); estimateColor.setB(estimateColor.b() - estimateColor.b()*poroportionnalBlack);
} }
if(m_currentColor != estimateColor) { if(propertyValue.get() != estimateColor) {
m_currentColor = estimateColor; propertyValue.set(estimateColor);
signalChange.emit(m_currentColor); signalChange.emit(propertyValue.get());
} }
return true; return true;
} }

6
ewol/widget/ColorBar.h
View File

@ -20,17 +20,16 @@ namespace ewol {
class ColorBar : public ewol::Widget { class ColorBar : public ewol::Widget {
public: // signals public: // signals
esignal::Signal<etk::Color<>> signalChange; esignal::Signal<etk::Color<>> signalChange;
public:
eproperty::Value<etk::Color<>> propertyValue;
protected: protected:
ColorBar(); ColorBar();
void init(); void init();
public: public:
DECLARE_WIDGET_FACTORY(ColorBar, "ColorBar"); DECLARE_WIDGET_FACTORY(ColorBar, "ColorBar");
virtual ~ColorBar(); virtual ~ColorBar();
etk::Color<> getCurrentColor();
void setCurrentColor(etk::Color<> _newOne);
private: private:
ewol::compositing::Drawing m_draw; //!< Compositing drawing element ewol::compositing::Drawing m_draw; //!< Compositing drawing element
etk::Color<> m_currentColor;
vec2 m_currentUserPos; vec2 m_currentUserPos;
protected: // Derived function protected: // Derived function
virtual void onDraw(); virtual void onDraw();
@ -38,6 +37,7 @@ namespace ewol {
virtual void calculateMinMaxSize(); virtual void calculateMinMaxSize();
virtual void onRegenerateDisplay(); virtual void onRegenerateDisplay();
virtual bool onEventInput(const ewol::event::Input& _event); virtual bool onEventInput(const ewol::event::Input& _event);
virtual void onPropertyChangeValue(const eproperty::Ref& _paramPointer);
}; };
}; };
}; };

16
ewol/widget/Container.cpp
View File

@ -92,12 +92,12 @@ std::shared_ptr<ewol::Object> ewol::widget::Container::getSubObjectNamed(const s
} }
void ewol::widget::Container::systemDraw(const ewol::DrawProperty& _displayProp) { void ewol::widget::Container::systemDraw(const ewol::DrawProperty& _displayProp) {
if (true == m_hide){ if (propertyHide.get() == true){
// widget is hidden ... // widget is hidden ...
return; return;
} }
ewol::Widget::systemDraw(_displayProp); ewol::Widget::systemDraw(_displayProp);
if (nullptr!=m_subWidget) { if (m_subWidget != nullptr) {
ewol::DrawProperty prop = _displayProp; ewol::DrawProperty prop = _displayProp;
prop.limit(m_origin, m_size); prop.limit(m_origin, m_size);
m_subWidget->systemDraw(prop); m_subWidget->systemDraw(prop);
@ -111,8 +111,8 @@ void ewol::widget::Container::onChangeSize() {
} }
vec2 origin = m_origin+m_offset; vec2 origin = m_origin+m_offset;
vec2 minSize = m_subWidget->getCalculateMinSize(); vec2 minSize = m_subWidget->getCalculateMinSize();
bvec2 expand = m_subWidget->getExpand(); bvec2 expand = m_subWidget->propertyExpand.get();
origin += ewol::gravityGenerateDelta(m_gravity, minSize - m_size); origin += ewol::gravityGenerateDelta(propertyGravity.get(), minSize - m_size);
m_subWidget->setOrigin(origin); m_subWidget->setOrigin(origin);
m_subWidget->setSize(m_size); m_subWidget->setSize(m_size);
m_subWidget->onChangeSize(); m_subWidget->onChangeSize();
@ -122,7 +122,7 @@ void ewol::widget::Container::calculateMinMaxSize() {
// call main class // call main class
ewol::Widget::calculateMinMaxSize(); ewol::Widget::calculateMinMaxSize();
// call sub classes // call sub classes
if (nullptr!=m_subWidget) { if (m_subWidget != nullptr) {
m_subWidget->calculateMinMaxSize(); m_subWidget->calculateMinMaxSize();
vec2 min = m_subWidget->getCalculateMinSize(); vec2 min = m_subWidget->getCalculateMinSize();
m_minSize.setMax(min); m_minSize.setMax(min);
@ -131,14 +131,14 @@ void ewol::widget::Container::calculateMinMaxSize() {
} }
void ewol::widget::Container::onRegenerateDisplay() { void ewol::widget::Container::onRegenerateDisplay() {
if (nullptr!=m_subWidget) { if (m_subWidget != nullptr) {
m_subWidget->onRegenerateDisplay(); m_subWidget->onRegenerateDisplay();
} }
} }
std::shared_ptr<ewol::Widget> ewol::widget::Container::getWidgetAtPos(const vec2& _pos) { std::shared_ptr<ewol::Widget> ewol::widget::Container::getWidgetAtPos(const vec2& _pos) {
if (false == isHide()) { if (propertyHide.get() == false) {
if (nullptr!=m_subWidget) { if (m_subWidget != nullptr) {
return m_subWidget->getWidgetAtPos(_pos); return m_subWidget->getWidgetAtPos(_pos);
} }
} }

12
ewol/widget/Container2.cpp
View File

@ -104,7 +104,7 @@ std::shared_ptr<ewol::Object> ewol::widget::Container2::getSubObjectNamed(const
} }
void ewol::widget::Container2::systemDraw(const ewol::DrawProperty& _displayProp) { void ewol::widget::Container2::systemDraw(const ewol::DrawProperty& _displayProp) {
if (true == m_hide){ if (propertyHide.get() == true){
// widget is hidden ... // widget is hidden ...
return; return;
} }
@ -119,21 +119,21 @@ ewol::Padding ewol::widget::Container2::onChangeSizePadded(const ewol::Padding&
vec2 localAvaillable = m_size - vec2(_padding.x(), _padding.y()); vec2 localAvaillable = m_size - vec2(_padding.x(), _padding.y());
// Checkin the filling properties == > for the subElements: // Checkin the filling properties == > for the subElements:
vec2 subElementSize = m_minSize; vec2 subElementSize = m_minSize;
if (m_userFill->x() == true) { if (propertyFill->x() == true) {
subElementSize.setX(m_size.x()); subElementSize.setX(m_size.x());
} }
if (m_userFill->y() == true) { if (propertyFill->y() == true) {
subElementSize.setY(m_size.y()); subElementSize.setY(m_size.y());
} }
vec2 delta = ewol::gravityGenerateDelta(m_gravity, m_size - subElementSize); vec2 delta = ewol::gravityGenerateDelta(propertyGravity, m_size - subElementSize);
vec2 origin = delta + vec2(_padding.xLeft(), _padding.yButtom()); vec2 origin = delta + vec2(_padding.xLeft(), _padding.yButtom());
subElementSize -= vec2(_padding.x(), _padding.y()); subElementSize -= vec2(_padding.x(), _padding.y());
for (size_t iii = 0; iii < 2; ++iii) { for (size_t iii = 0; iii < 2; ++iii) {
if (m_subWidget[iii] != nullptr) { if (m_subWidget[iii] != nullptr) {
vec2 origin2 = origin+m_offset; vec2 origin2 = origin+m_offset;
vec2 minSize = m_subWidget[iii]->getCalculateMinSize(); vec2 minSize = m_subWidget[iii]->getCalculateMinSize();
bvec2 expand = m_subWidget[iii]->getExpand(); bvec2 expand = m_subWidget[iii]->propertyExpand.get();
origin2 += ewol::gravityGenerateDelta(m_gravity, minSize - localAvaillable); origin2 += ewol::gravityGenerateDelta(propertyGravity, minSize - localAvaillable);
m_subWidget[iii]->setOrigin(m_origin + origin); m_subWidget[iii]->setOrigin(m_origin + origin);
m_subWidget[iii]->setSize(subElementSize); m_subWidget[iii]->setSize(subElementSize);
m_subWidget[iii]->onChangeSize(); m_subWidget[iii]->onChangeSize();

29
ewol/widget/ContainerN.cpp
View File

@ -16,7 +16,7 @@
ewol::widget::ContainerN::ContainerN() : ewol::widget::ContainerN::ContainerN() :
m_lockExpand(false,false), propertyLockExpand(*this, "lock", vec2(false,false), "Lock the subwidget expand"),
m_subExpend(false,false) { m_subExpend(false,false) {
addObjectType("ewol::widget::ContainerN"); addObjectType("ewol::widget::ContainerN");
// nothing to do ... // nothing to do ...
@ -32,30 +32,29 @@ ewol::widget::ContainerN::~ContainerN() {
bvec2 ewol::widget::ContainerN::canExpand() { bvec2 ewol::widget::ContainerN::canExpand() {
bvec2 res = m_userExpand; bvec2 res = propertyExpand.get();
if (false == m_lockExpand.x()) { if (propertyLockExpand->x() == false) {
if (true == m_subExpend.x()) { if (m_subExpend.x() == true) {
res.setX(true); res.setX(true);
} }
} }
if (false == m_lockExpand.y()) { if (propertyLockExpand->y() == false) {
if (true == m_subExpend.y()) { if (m_subExpend.y() == true) {
res.setY(true); res.setY(true);
} }
} }
//EWOL_DEBUG("Expend check : user=" << m_userExpand << " lock=" << m_lockExpand << " sub=" << m_subExpend << " res=" << res); //EWOL_DEBUG("Expend check : user=" << m_userExpand << " lock=" << propertyLockExpand << " sub=" << m_subExpend << " res=" << res);
return res; return res;
} }
void ewol::widget::ContainerN::lockExpand(const bvec2& _lockExpand) { void ewol::widget::ContainerN::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
if (_lockExpand != m_lockExpand) { ewol::Widget::onPropertyChangeValue(_paramPointer);
m_lockExpand = _lockExpand; if (_paramPointer == propertyLockExpand) {
markToRedraw(); markToRedraw();
requestUpdateSize(); requestUpdateSize();
} }
} }
void ewol::widget::ContainerN::subWidgetReplace(const std::shared_ptr<ewol::Widget>& _oldWidget, void ewol::widget::ContainerN::subWidgetReplace(const std::shared_ptr<ewol::Widget>& _oldWidget,
const std::shared_ptr<ewol::Widget>& _newWidget) { const std::shared_ptr<ewol::Widget>& _newWidget) {
bool haveChange = false; bool haveChange = false;
@ -179,7 +178,7 @@ std::shared_ptr<ewol::Object> ewol::widget::ContainerN::getSubObjectNamed(const
} }
void ewol::widget::ContainerN::systemDraw(const ewol::DrawProperty& _displayProp) { void ewol::widget::ContainerN::systemDraw(const ewol::DrawProperty& _displayProp) {
if (true == m_hide){ if (propertyHide.get() == true){
// widget is hidden ... // widget is hidden ...
return; return;
} }
@ -238,7 +237,7 @@ void ewol::widget::ContainerN::onRegenerateDisplay() {
} }
std::shared_ptr<ewol::Widget> ewol::widget::ContainerN::getWidgetAtPos(const vec2& _pos) { std::shared_ptr<ewol::Widget> ewol::widget::ContainerN::getWidgetAtPos(const vec2& _pos) {
if (true == isHide()) { if (propertyHide.get() == true) {
return nullptr; return nullptr;
} }
// for all element in the sizer ... // for all element in the sizer ...
@ -250,7 +249,7 @@ std::shared_ptr<ewol::Widget> ewol::widget::ContainerN::getWidgetAtPos(const vec
&& (tmpOrigin.y() <= _pos.y() && tmpOrigin.y() + tmpSize.y() >= _pos.y()) ) && (tmpOrigin.y() <= _pos.y() && tmpOrigin.y() + tmpSize.y() >= _pos.y()) )
{ {
std::shared_ptr<ewol::Widget> tmpWidget = it->getWidgetAtPos(_pos); std::shared_ptr<ewol::Widget> tmpWidget = it->getWidgetAtPos(_pos);
if (nullptr != tmpWidget) { if (tmpWidget != nullptr) {
return tmpWidget; return tmpWidget;
} }
// stop searching // stop searching
@ -273,7 +272,7 @@ bool ewol::widget::ContainerN::loadXML(const std::shared_ptr<const exml::Element
std::string tmpAttributeValue = _node->getAttribute("lock"); std::string tmpAttributeValue = _node->getAttribute("lock");
if (tmpAttributeValue.size()!=0) { if (tmpAttributeValue.size()!=0) {
m_lockExpand = tmpAttributeValue; propertyLockExpand = tmpAttributeValue;
} }
bool invertAdding=false; bool invertAdding=false;
tmpAttributeValue = _node->getAttribute("addmode"); tmpAttributeValue = _node->getAttribute("addmode");

10
ewol/widget/ContainerN.h
View File

@ -19,6 +19,8 @@ namespace ewol {
* @brief the Cotainer widget is a widget that have an only one subWidget * @brief the Cotainer widget is a widget that have an only one subWidget
*/ */
class ContainerN : public ewol::Widget { class ContainerN : public ewol::Widget {
public: // properties:
eproperty::Value<bvec2> propertyLockExpand; //!< Lock the expend of the sub widget to this one == > this permit to limit bigger subWidget
protected: protected:
std::list<std::shared_ptr<ewol::Widget>> m_subWidget; std::list<std::shared_ptr<ewol::Widget>> m_subWidget;
protected: protected:
@ -33,14 +35,7 @@ namespace ewol {
*/ */
virtual ~ContainerN(); virtual ~ContainerN();
protected: protected:
bvec2 m_lockExpand; //!< Lock the expend of the sub widget to this one == > this permit to limit bigger subWidget
bvec2 m_subExpend; //!< reference of the sub element expention requested. bvec2 m_subExpend; //!< reference of the sub element expention requested.
public:
/**
* @brief Limit the expend properties to the current widget (no contamination)
* @param[in] _lockExpend Lock mode of the expend properties
*/
void lockExpand(const bvec2& _lockExpand);
// herited function // herited function
virtual bvec2 canExpand(); virtual bvec2 canExpand();
public: public:
@ -103,6 +98,7 @@ namespace ewol {
virtual bool loadXML(const std::shared_ptr<const exml::Element>& _node); virtual bool loadXML(const std::shared_ptr<const exml::Element>& _node);
virtual void setOffset(const vec2& _newVal); virtual void setOffset(const vec2& _newVal);
virtual void requestDestroyFromChild(const std::shared_ptr<Object>& _child); virtual void requestDestroyFromChild(const std::shared_ptr<Object>& _child);
void onPropertyChangeValue(const eproperty::Ref& _paramPointer);
}; };
}; };
}; };

99
ewol/widget/ContextMenu.cpp
View File

@ -19,21 +19,19 @@
ewol::widget::ContextMenu::ContextMenu(): ewol::widget::ContextMenu::ContextMenu():
m_shaper(*this, "shaper", "the display name for config file"), propertyShape(*this, "shape", "", "the display name for config file"),
m_arrowPos(*this, "arrow-position", vec2(0,0), "Position of the arrow in the pop-up"), propertyArrowPos(*this, "arrow-position", vec2(0,0), "Position of the arrow in the pop-up"),
m_arrawBorder(*this, "arrow-mode", markTop, "position of the arrow") { propertyArrawBorder(*this, "arrow-mode", markTop, "position of the arrow") {
addObjectType("ewol::widget::ContextMenu"); addObjectType("ewol::widget::ContextMenu");
m_arrawBorder.add(markTop, "top"); propertyArrawBorder.add(markTop, "top");
m_arrawBorder.add(markRight, "right"); propertyArrawBorder.add(markRight, "right");
m_arrawBorder.add(markButtom, "buttom"); propertyArrawBorder.add(markButtom, "buttom");
m_arrawBorder.add(markLeft, "left"); propertyArrawBorder.add(markLeft, "left");
m_arrawBorder.add(markNone, "none"); propertyArrawBorder.add(markNone, "none");
m_userExpand.set(bvec2(false,false));
m_offset = 20; m_offset = 20;
m_colorBackGroung = etk::color::white;
m_colorBorder = etk::color::black; m_colorBorder = etk::color::black;
m_colorBorder.setA(0x7F); m_colorBorder.setA(0x7F);
@ -43,7 +41,8 @@ ewol::widget::ContextMenu::ContextMenu():
void ewol::widget::ContextMenu::init(const std::string& _shaperName) { void ewol::widget::ContextMenu::init(const std::string& _shaperName) {
ewol::widget::Container::init(); ewol::widget::Container::init();
m_shaper.set(_shaperName); propertyShape.set(_shaperName);
propertyExpand.set(bvec2(false,false));
} }
ewol::widget::ContextMenu::~ContextMenu() { ewol::widget::ContextMenu::~ContextMenu() {
@ -53,7 +52,7 @@ ewol::widget::ContextMenu::~ContextMenu() {
void ewol::widget::ContextMenu::onChangeSize() { void ewol::widget::ContextMenu::onChangeSize() {
markToRedraw(); markToRedraw();
// pop-up fill all the display : // pop-up fill all the display :
ewol::Padding padding = m_shaper->getPadding(); ewol::Padding padding = m_shaper.getPadding();
EWOL_VERBOSE("our origin=" << m_origin << " size=" << m_size); EWOL_VERBOSE("our origin=" << m_origin << " size=" << m_size);
if (m_subWidget == nullptr) { if (m_subWidget == nullptr) {
return; return;
@ -74,14 +73,14 @@ void ewol::widget::ContextMenu::onChangeSize() {
subWidgetSize.setY((int32_t)subWidgetSize.y()); subWidgetSize.setY((int32_t)subWidgetSize.y());
// set config to the Sub-widget // set config to the Sub-widget
switch (m_arrawBorder) { switch (propertyArrawBorder.get()) {
case markTop: case markTop:
subWidgetOrigin.setX((int32_t)(m_arrowPos->x() - subWidgetSize.x()/2)); subWidgetOrigin.setX((int32_t)(propertyArrowPos->x() - subWidgetSize.x()/2));
subWidgetOrigin.setY((int32_t)(m_arrowPos->y() - m_offset - subWidgetSize.y())); subWidgetOrigin.setY((int32_t)(propertyArrowPos->y() - m_offset - subWidgetSize.y()));
break; break;
case markButtom: case markButtom:
subWidgetOrigin.setX((int32_t)(m_arrowPos->x() - subWidgetSize.x()/2)); subWidgetOrigin.setX((int32_t)(propertyArrowPos->x() - subWidgetSize.x()/2));
subWidgetOrigin.setY((int32_t)(m_arrowPos->y() + m_offset)); subWidgetOrigin.setY((int32_t)(propertyArrowPos->y() + m_offset));
break; break;
case markRight: case markRight:
case markLeft: case markLeft:
@ -95,18 +94,18 @@ void ewol::widget::ContextMenu::onChangeSize() {
+ padding.x()) ); + padding.x()) );
subWidgetOrigin.setY( (int32_t)( std::max(0, (int32_t)(subWidgetOrigin.y()-padding.y())) subWidgetOrigin.setY( (int32_t)( std::max(0, (int32_t)(subWidgetOrigin.y()-padding.y()))
+ padding.y()) ); + padding.y()) );
switch (m_arrawBorder) { switch (propertyArrawBorder.get()) {
default: default:
case markTop: case markTop:
case markButtom: case markButtom:
if (m_arrowPos->x() <= m_offset ) { if (propertyArrowPos->x() <= m_offset ) {
subWidgetOrigin.setX(m_arrowPos->x()+padding.xLeft()); subWidgetOrigin.setX(propertyArrowPos->x()+padding.xLeft());
} }
break; break;
case markRight: case markRight:
case markLeft: case markLeft:
if (m_arrowPos->y() <= m_offset ) { if (propertyArrowPos->y() <= m_offset ) {
subWidgetOrigin.setY(m_arrowPos->y()+padding.yButtom()); subWidgetOrigin.setY(propertyArrowPos->y()+padding.yButtom());
} }
break; break;
} }
@ -121,7 +120,7 @@ void ewol::widget::ContextMenu::calculateMinMaxSize() {
// call main class to calculate the min size... // call main class to calculate the min size...
ewol::widget::Container::calculateMinMaxSize(); ewol::widget::Container::calculateMinMaxSize();
// add padding of the display // add padding of the display
ewol::Padding padding = m_shaper->getPadding(); ewol::Padding padding = m_shaper.getPadding();
m_minSize += vec2(padding.x(), padding.y()); m_minSize += vec2(padding.x(), padding.y());
//EWOL_DEBUG("CalculateMinSize=>>" << m_minSize); //EWOL_DEBUG("CalculateMinSize=>>" << m_minSize);
markToRedraw(); markToRedraw();
@ -130,7 +129,7 @@ void ewol::widget::ContextMenu::calculateMinMaxSize() {
void ewol::widget::ContextMenu::onDraw() { void ewol::widget::ContextMenu::onDraw() {
m_compositing.draw(); m_compositing.draw();
m_shaper->draw(); m_shaper.draw();
} }
@ -141,8 +140,8 @@ void ewol::widget::ContextMenu::onRegenerateDisplay() {
return; return;
} }
m_compositing.clear(); m_compositing.clear();
m_shaper->clear(); m_shaper.clear();
ewol::Padding padding = m_shaper->getPadding(); ewol::Padding padding = m_shaper.getPadding();
if (m_subWidget == nullptr) { if (m_subWidget == nullptr) {
return; return;
@ -152,38 +151,38 @@ void ewol::widget::ContextMenu::onRegenerateDisplay() {
// display border ... // display border ...
m_compositing.setColor(m_colorBorder); m_compositing.setColor(m_colorBorder);
switch (m_arrawBorder) { switch (propertyArrawBorder) {
case markTop: case markTop:
m_compositing.setPos(vec3(m_arrowPos->x(), m_arrowPos->y(), 0.0f) ); m_compositing.setPos(vec3(propertyArrowPos->x(), propertyArrowPos->y(), 0.0f) );
m_compositing.addVertex(); m_compositing.addVertex();
if (m_arrowPos->x() <= tmpOrigin.x() ) { if (propertyArrowPos->x() <= tmpOrigin.x() ) {
float laking = m_offset - padding.yTop(); float laking = m_offset - padding.yTop();
m_compositing.setPos(vec3(m_arrowPos->x()+laking, m_arrowPos->y()-laking, 0.0f) ); m_compositing.setPos(vec3(propertyArrowPos->x()+laking, propertyArrowPos->y()-laking, 0.0f) );
m_compositing.addVertex(); m_compositing.addVertex();
m_compositing.setPos(vec3(m_arrowPos->x(), m_arrowPos->y()-laking, 0.0f) ); m_compositing.setPos(vec3(propertyArrowPos->x(), propertyArrowPos->y()-laking, 0.0f) );
m_compositing.addVertex(); m_compositing.addVertex();
} else { } else {
float laking = m_offset - padding.yTop(); float laking = m_offset - padding.yTop();
m_compositing.setPos(vec3(m_arrowPos->x()+laking, m_arrowPos->y()-laking, 0.0f) ); m_compositing.setPos(vec3(propertyArrowPos->x()+laking, propertyArrowPos->y()-laking, 0.0f) );
m_compositing.addVertex(); m_compositing.addVertex();
m_compositing.setPos(vec3(m_arrowPos->x()-laking, m_arrowPos->y()-laking, 0.0f) ); m_compositing.setPos(vec3(propertyArrowPos->x()-laking, propertyArrowPos->y()-laking, 0.0f) );
m_compositing.addVertex(); m_compositing.addVertex();
} }
break; break;
case markButtom: case markButtom:
m_compositing.setPos(vec3(m_arrowPos->x(), m_arrowPos->y(), 0) ); m_compositing.setPos(vec3(propertyArrowPos->x(), propertyArrowPos->y(), 0) );
m_compositing.addVertex(); m_compositing.addVertex();
if (m_arrowPos->x() <= tmpOrigin.x() ) { if (propertyArrowPos->x() <= tmpOrigin.x() ) {
int32_t laking = m_offset - padding.yTop(); int32_t laking = m_offset - padding.yTop();
m_compositing.setPos(vec3(m_arrowPos->x()+laking, m_arrowPos->y()+laking, 0.0f) ); m_compositing.setPos(vec3(propertyArrowPos->x()+laking, propertyArrowPos->y()+laking, 0.0f) );
m_compositing.addVertex(); m_compositing.addVertex();
m_compositing.setPos(vec3(m_arrowPos->x(), m_arrowPos->y()+laking, 0.0f) ); m_compositing.setPos(vec3(propertyArrowPos->x(), propertyArrowPos->y()+laking, 0.0f) );
m_compositing.addVertex(); m_compositing.addVertex();
} else { } else {
int32_t laking = m_offset - padding.yTop(); int32_t laking = m_offset - padding.yTop();
m_compositing.setPos(vec3(m_arrowPos->x()+laking, m_arrowPos->y()+laking, 0.0f) ); m_compositing.setPos(vec3(propertyArrowPos->x()+laking, propertyArrowPos->y()+laking, 0.0f) );
m_compositing.addVertex(); m_compositing.addVertex();
m_compositing.setPos(vec3(m_arrowPos->x()-laking, m_arrowPos->y()+laking, 0.0f) ); m_compositing.setPos(vec3(propertyArrowPos->x()-laking, propertyArrowPos->y()+laking, 0.0f) );
m_compositing.addVertex(); m_compositing.addVertex();
} }
break; break;
@ -196,13 +195,13 @@ void ewol::widget::ContextMenu::onRegenerateDisplay() {
vec2 shaperOrigin = tmpOrigin-vec2(padding.xLeft(), padding.yButtom()); vec2 shaperOrigin = tmpOrigin-vec2(padding.xLeft(), padding.yButtom());
vec2 shaperSize = tmpSize+vec2(padding.x(), padding.y()); vec2 shaperSize = tmpSize+vec2(padding.x(), padding.y());
m_shaper->setShape(vec2ClipInt32(shaperOrigin), m_shaper.setShape(vec2ClipInt32(shaperOrigin),
vec2ClipInt32(shaperSize)); vec2ClipInt32(shaperSize));
} }
bool ewol::widget::ContextMenu::onEventInput(const ewol::event::Input& _event) { bool ewol::widget::ContextMenu::onEventInput(const ewol::event::Input& _event) {
if (_event.getId() > 0) { if (_event.getId() > 0) {
if (nullptr != ewol::widget::Container::getWidgetAtPos(_event.getPos())) { if (ewol::widget::Container::getWidgetAtPos(_event.getPos()) != nullptr) {
return false; return false;
} }
if( _event.getStatus() == gale::key::status_down if( _event.getStatus() == gale::key::status_down
@ -221,23 +220,21 @@ bool ewol::widget::ContextMenu::onEventInput(const ewol::event::Input& _event) {
std::shared_ptr<ewol::Widget> ewol::widget::ContextMenu::getWidgetAtPos(const vec2& _pos) { std::shared_ptr<ewol::Widget> ewol::widget::ContextMenu::getWidgetAtPos(const vec2& _pos) {
std::shared_ptr<ewol::Widget> val = ewol::widget::Container::getWidgetAtPos(_pos); std::shared_ptr<ewol::Widget> val = ewol::widget::Container::getWidgetAtPos(_pos);
if (nullptr != val) { if (val != nullptr) {
return val; return val;
} }
return std::dynamic_pointer_cast<ewol::Widget>(shared_from_this()); return std::dynamic_pointer_cast<ewol::Widget>(shared_from_this());
} }
void ewol::widget::ContextMenu::setShaperName(const std::string& _shaperName) {
m_shaper.set(_shaperName);
}
void ewol::widget::ContextMenu::onPropertyChangeValue(const eproperty::Ref& _paramPointer) { void ewol::widget::ContextMenu::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::widget::Container::onPropertyChangeValue(_paramPointer); ewol::widget::Container::onPropertyChangeValue(_paramPointer);
if (_paramPointer == m_shaper) { if (_paramPointer == propertyArrowPos) {
markToRedraw(); markToRedraw();
} else if (_paramPointer == m_arrowPos) { } else if (_paramPointer == propertyArrawBorder) {
markToRedraw(); markToRedraw();
} else if (_paramPointer == m_arrawBorder) { } else if (_paramPointer == propertyShape) {
m_shaper.setSource(propertyShape.get());
markToRedraw(); markToRedraw();
} }
} }
@ -258,7 +255,7 @@ void ewol::widget::ContextMenu::setPositionMarkAuto(const vec2& _origin, const v
} }
} }
void ewol::widget::ContextMenu::setPositionMark(enum markPosition _position, const vec2& _arrowPos) { void ewol::widget::ContextMenu::setPositionMark(enum markPosition _position, const vec2& _arrowPos) {
m_arrawBorder.set(_position); propertyArrawBorder.set(_position);
m_arrowPos.set(_arrowPos); propertyArrowPos.set(_arrowPos);
} }

9
ewol/widget/ContextMenu.h
View File

@ -30,9 +30,9 @@ namespace ewol {
markNone markNone
}; };
public: // properties public: // properties
eproperty::Value<std::string> propertyShape; //!< shape of the widget.
eproperty::Value<vec2> propertyArrowPos; eproperty::Value<vec2> propertyArrowPos;
eproperty::List<enum markPosition> propertyArrawBorder; eproperty::List<enum markPosition> propertyArrawBorder;
eproperty::Value<std::string> propertyShaper; //!< Compositing theme.
protected: protected:
ContextMenu(); ContextMenu();
void init(const std::string& _shaperName="{ewol}THEME:GUI:ContextMenu.json"); void init(const std::string& _shaperName="{ewol}THEME:GUI:ContextMenu.json");
@ -41,9 +41,12 @@ namespace ewol {
virtual ~ContextMenu(); virtual ~ContextMenu();
private: private:
ewol::compositing::Shaper m_shaper; //!< Compositing theme. ewol::compositing::Shaper m_shaper; //!< Compositing theme.
// TODO : Use shaper for the arraw ...
ewol::compositing::Drawing m_compositing; ewol::compositing::Drawing m_compositing;
etk::Color<> m_colorBackGroung; etk::Color<> m_colorBorder; // use shaper ID
etk::Color<> m_colorBorder;
float m_offset; float m_offset;
public: public:
void setPositionMarkAuto(const vec2& _origin, const vec2& _size); void setPositionMarkAuto(const vec2& _origin, const vec2& _size);

236
ewol/widget/Entry.cpp
View File

@ -25,29 +25,29 @@ ewol::widget::Entry::Entry() :
signalClick(*this, "click", "the user Click on the Entry box"), signalClick(*this, "click", "the user Click on the Entry box"),
signalEnter(*this, "enter", "The cursor enter inside the button"), signalEnter(*this, "enter", "The cursor enter inside the button"),
signalModify(*this, "modify", "Entry box value change"), signalModify(*this, "modify", "Entry box value change"),
m_shaper(*this, "shaper", "Shaper to display the background"), propertyShaper(*this, "shaper", "", "Shaper to display the background"),
m_data(*this, "value", "", "Value display in the entry (decorated text)"), propertyValue(*this, "value", "", "Value display in the entry (decorated text)"),
m_maxCharacter(*this, "max", 0x7FFFFFFF, 0, 0x7FFFFFFF, "Maximum cgar that can be set on the Entry"), propertyMaxCharacter(*this, "max", 0x7FFFFFFF, 0, 0x7FFFFFFF, "Maximum cgar that can be set on the Entry"),
m_regexValue(*this, "regex", ".*", "Control what it is write with a regular expression"), propertyRegex(*this, "regex", ".*", "Control what it is write with a regular expression"),
propertyTextWhenNothing(*this, "empty-text", "", "Text when nothing is written"),
m_needUpdateTextPos(true), m_needUpdateTextPos(true),
m_displayStartPosition(0), m_displayStartPosition(0),
m_displayCursor(false), m_displayCursor(false),
m_displayCursorPos(0), m_displayCursorPos(0),
m_displayCursorPosSelection(0), m_displayCursorPosSelection(0) {
m_textWhenNothing(*this, "emptytext", "", "Text that is displayed when the Entry is empty (decorated text)") {
addObjectType("ewol::widget::Entry"); addObjectType("ewol::widget::Entry");
} }
void ewol::widget::Entry::init(const std::string& _newData, const std::string& _shaperName) { void ewol::widget::Entry::init(const std::string& _newData, const std::string& _shaperName) {
ewol::Widget::init(); ewol::Widget::init();
m_data.set(_newData); propertyValue.set(_newData);
m_shaper.setString(_shaperName); propertyShaper.set(_shaperName);
setCanHaveFocus(true); propertyCanFocus.set(true);
try { try {
m_regex.assign(".*", std::regex_constants::optimize | std::regex_constants::ECMAScript); m_regex.assign(".*", std::regex_constants::optimize | std::regex_constants::ECMAScript);
} catch (std::regex_error e) { } catch (std::regex_error e) {
EWOL_ERROR("can not parse regex : '" << e.what() << "' for : " << m_regexValue); EWOL_ERROR("can not parse regex : '" << e.what() << "' for : " << propertyRegex);
} }
markToRedraw(); markToRedraw();
@ -87,7 +87,7 @@ void ewol::widget::Entry::calculateMinMaxSize() {
// call main class // call main class
ewol::Widget::calculateMinMaxSize(); ewol::Widget::calculateMinMaxSize();
// get generic padding // get generic padding
ewol::Padding padding = m_shaper->getPadding(); ewol::Padding padding = m_shaper.getPadding();
int32_t minHeight = m_text.calculateSize(char32_t('A')).y(); int32_t minHeight = m_text.calculateSize(char32_t('A')).y();
vec2 minimumSizeBase(20, minHeight); vec2 minimumSizeBase(20, minHeight);
// add padding : // add padding :
@ -97,48 +97,31 @@ void ewol::widget::Entry::calculateMinMaxSize() {
checkMinSize(); checkMinSize();
} }
// TODO : ... Set it a a generic parameter...
void ewol::widget::Entry::setValue(const std::string& _newData) {
std::string newData = _newData;
if ((int64_t)newData.size() > m_maxCharacter) {
newData = std::string(_newData, 0, m_maxCharacter);
EWOL_DEBUG("Limit entry set of data... " << std::string(_newData, m_maxCharacter));
}
// set the value with the check of the RegExp ...
setInternalValue(newData);
if (newData == m_data.get()) {
m_displayCursorPos = m_data->size();
m_displayCursorPosSelection = m_displayCursorPos;
EWOL_VERBOSE("Set : '" << newData << "'");
}
markToRedraw();
}
void ewol::widget::Entry::onDraw() { void ewol::widget::Entry::onDraw() {
m_shaper->draw(); m_shaper.draw();
m_text.draw(); m_text.draw();
} }
void ewol::widget::Entry::onRegenerateDisplay() { void ewol::widget::Entry::onRegenerateDisplay() {
if (true == needRedraw()) { if (needRedraw() == true) {
m_shaper->clear(); m_shaper.clear();
m_text.clear(); m_text.clear();
if (m_colorIdTextFg >= 0) { if (m_colorIdTextFg >= 0) {
m_text.setDefaultColorFg(m_shaper->getColor(m_colorIdTextFg)); m_text.setDefaultColorFg(m_shaper.getColor(m_colorIdTextFg));
m_text.setDefaultColorBg(m_shaper->getColor(m_colorIdTextBg)); m_text.setDefaultColorBg(m_shaper.getColor(m_colorIdTextBg));
m_text.setCursorColor(m_shaper->getColor(m_colorIdCursor)); m_text.setCursorColor(m_shaper.getColor(m_colorIdCursor));
m_text.setSelectionColor(m_shaper->getColor(m_colorIdSelection)); m_text.setSelectionColor(m_shaper.getColor(m_colorIdSelection));
} }
updateTextPosition(); updateTextPosition();
ewol::Padding padding = m_shaper->getPadding(); ewol::Padding padding = m_shaper.getPadding();
vec2 tmpSizeShaper = m_minSize; vec2 tmpSizeShaper = m_minSize;
if (true == m_userFill->x()) { if (propertyFill->x() == true) {
tmpSizeShaper.setX(m_size.x()); tmpSizeShaper.setX(m_size.x());
} }
if (true == m_userFill->y()) { if (propertyFill->y() == true) {
tmpSizeShaper.setY(m_size.y()); tmpSizeShaper.setY(m_size.y());
} }
@ -147,7 +130,7 @@ void ewol::widget::Entry::onRegenerateDisplay() {
vec2 tmpOriginText = (m_size - tmpSizeText) / 2.0f; vec2 tmpOriginText = (m_size - tmpSizeText) / 2.0f;
// sometimes, the user define an height bigger than the real size needed == > in this case we need to center the text in the shaper ... // sometimes, the user define an height bigger than the real size needed == > in this case we need to center the text in the shaper ...
int32_t minHeight = m_text.calculateSize(char32_t('A')).y(); int32_t minHeight = m_text.calculateSize(char32_t('A')).y();
if (tmpSizeText.y()>minHeight) { if (tmpSizeText.y() > minHeight) {
tmpOriginText += vec2(0,(tmpSizeText.y()-minHeight)/2.0f); tmpOriginText += vec2(0,(tmpSizeText.y()-minHeight)/2.0f);
} }
// fix all the position in the int32_t class: // fix all the position in the int32_t class:
@ -164,33 +147,33 @@ void ewol::widget::Entry::onRegenerateDisplay() {
} else { } else {
m_text.setCursorPos(m_displayCursorPos); m_text.setCursorPos(m_displayCursorPos);
} }
if (0!=m_data->size()) { if (propertyValue->size() != 0) {
m_text.print(m_data); m_text.print(propertyValue);
} else { } else {
if (0!=m_textWhenNothing->size()) { if (propertyTextWhenNothing->size() != 0) {
m_text.printDecorated(m_textWhenNothing); m_text.printDecorated(propertyTextWhenNothing);
} }
} }
m_text.setClippingMode(false); m_text.setClippingMode(false);
m_shaper->setShape(tmpOriginShaper, tmpSizeShaper, tmpOriginText, tmpSizeText); m_shaper.setShape(tmpOriginShaper, tmpSizeShaper, tmpOriginText, tmpSizeText);
} }
} }
void ewol::widget::Entry::updateCursorPosition(const vec2& _pos, bool _selection) { void ewol::widget::Entry::updateCursorPosition(const vec2& _pos, bool _selection) {
ewol::Padding padding = m_shaper->getPadding(); ewol::Padding padding = m_shaper.getPadding();
vec2 relPos = relativePosition(_pos); vec2 relPos = relativePosition(_pos);
relPos.setX(relPos.x()-m_displayStartPosition - padding.xLeft()); relPos.setX(relPos.x()-m_displayStartPosition - padding.xLeft());
// try to find the new cursor position : // try to find the new cursor position :
std::string tmpDisplay = std::string(m_data, 0, m_displayStartPosition); std::string tmpDisplay = std::string(propertyValue, 0, m_displayStartPosition);
int32_t displayHidenSize = m_text.calculateSize(tmpDisplay).x(); int32_t displayHidenSize = m_text.calculateSize(tmpDisplay).x();
//EWOL_DEBUG("hidenSize : " << displayHidenSize); //EWOL_DEBUG("hidenSize : " << displayHidenSize);
int32_t newCursorPosition = -1; int32_t newCursorPosition = -1;
int32_t tmpTextOriginX = padding.xLeft(); int32_t tmpTextOriginX = padding.xLeft();
for (size_t iii=0; iii<m_data->size(); iii++) { for (size_t iii=0; iii<propertyValue->size(); iii++) {
tmpDisplay = std::string(m_data, 0, iii); tmpDisplay = std::string(propertyValue, 0, iii);
int32_t tmpWidth = m_text.calculateSize(tmpDisplay).x() - displayHidenSize; int32_t tmpWidth = m_text.calculateSize(tmpDisplay).x() - displayHidenSize;
if (tmpWidth >= relPos.x()-tmpTextOriginX) { if (tmpWidth >= relPos.x()-tmpTextOriginX) {
newCursorPosition = iii; newCursorPosition = iii;
@ -198,9 +181,9 @@ void ewol::widget::Entry::updateCursorPosition(const vec2& _pos, bool _selection
} }
} }
if (newCursorPosition == -1) { if (newCursorPosition == -1) {
newCursorPosition = m_data->size(); newCursorPosition = propertyValue->size();
} }
if (false == _selection) { if (_selection == false) {
m_displayCursorPos = newCursorPosition; m_displayCursorPos = newCursorPosition;
m_displayCursorPosSelection = m_displayCursorPos; m_displayCursorPosSelection = m_displayCursorPos;
markToRedraw(); markToRedraw();
@ -229,7 +212,7 @@ void ewol::widget::Entry::removeSelected() {
// remove data ... // remove data ...
m_displayCursorPos = pos1; m_displayCursorPos = pos1;
m_displayCursorPosSelection = pos1; m_displayCursorPosSelection = pos1;
m_data->erase(pos1, pos2-pos1); propertyValue->erase(pos1, pos2-pos1);
markToRedraw(); markToRedraw();
} }
@ -246,14 +229,14 @@ void ewol::widget::Entry::copySelectionToClipBoard(enum gale::context::clipBoard
pos1 = m_displayCursorPos; pos1 = m_displayCursorPos;
} }
// Copy // Copy
std::string tmpData = std::string(m_data, pos1, pos2); std::string tmpData = std::string(propertyValue, pos1, pos2);
gale::context::clipBoard::set(_clipboardID, tmpData); gale::context::clipBoard::set(_clipboardID, tmpData);
} }
bool ewol::widget::Entry::onEventInput(const ewol::event::Input& _event) { bool ewol::widget::Entry::onEventInput(const ewol::event::Input& _event) {
//EWOL_DEBUG("Event on Entry ... type=" << (int32_t)type << " id=" << IdInput); //EWOL_DEBUG("Event on Entry ... type=" << (int32_t)type << " id=" << IdInput);
if (1 == _event.getId()) { if (_event.getId() == 1) {
if (gale::key::status_single == _event.getStatus()) { if (gale::key::status_single == _event.getStatus()) {
keepFocus(); keepFocus();
signalClick.emit(); signalClick.emit();
@ -264,19 +247,19 @@ bool ewol::widget::Entry::onEventInput(const ewol::event::Input& _event) {
// select word // select word
m_displayCursorPosSelection = m_displayCursorPos-1; m_displayCursorPosSelection = m_displayCursorPos-1;
// search forward // search forward
for (size_t iii=m_displayCursorPos; iii <= m_data->size(); iii++) { for (size_t iii=m_displayCursorPos; iii <= propertyValue->size(); iii++) {
if(iii == m_data->size()) { if(iii == propertyValue->size()) {
m_displayCursorPos = iii; m_displayCursorPos = iii;
break; break;
} }
if(!( ( m_data.get()[iii] >= 'a' if(!( ( propertyValue.get()[iii] >= 'a'
&& m_data.get()[iii] <= 'z') && propertyValue.get()[iii] <= 'z')
|| ( m_data.get()[iii] >= 'A' || ( propertyValue.get()[iii] >= 'A'
&& m_data.get()[iii] <= 'Z') && propertyValue.get()[iii] <= 'Z')
|| ( m_data.get()[iii] >= '0' || ( propertyValue.get()[iii] >= '0'
&& m_data.get()[iii] <= '9') && propertyValue.get()[iii] <= '9')
|| m_data.get()[iii] == '_' || propertyValue.get()[iii] == '_'
|| m_data.get()[iii] == '-' || propertyValue.get()[iii] == '-'
) ) { ) ) {
m_displayCursorPos = iii; m_displayCursorPos = iii;
break; break;
@ -288,14 +271,14 @@ bool ewol::widget::Entry::onEventInput(const ewol::event::Input& _event) {
m_displayCursorPosSelection = 0; m_displayCursorPosSelection = 0;
break; break;
} }
if(!( ( m_data.get()[iii] >= 'a' if(!( ( propertyValue.get()[iii] >= 'a'
&& m_data.get()[iii] <= 'z') && propertyValue.get()[iii] <= 'z')
|| ( m_data.get()[iii] >= 'A' || ( propertyValue.get()[iii] >= 'A'
&& m_data.get()[iii] <= 'Z') && propertyValue.get()[iii] <= 'Z')
|| ( m_data.get()[iii] >= '0' || ( propertyValue.get()[iii] >= '0'
&& m_data.get()[iii] <= '9') && propertyValue.get()[iii] <= '9')
|| m_data.get()[iii] == '_' || propertyValue.get()[iii] == '_'
|| m_data.get()[iii] == '-' || propertyValue.get()[iii] == '-'
) ) { ) ) {
m_displayCursorPosSelection = iii+1; m_displayCursorPosSelection = iii+1;
break; break;
@ -307,7 +290,7 @@ bool ewol::widget::Entry::onEventInput(const ewol::event::Input& _event) {
} else if (gale::key::status_triple == _event.getStatus()) { } else if (gale::key::status_triple == _event.getStatus()) {
keepFocus(); keepFocus();
m_displayCursorPosSelection = 0; m_displayCursorPosSelection = 0;
m_displayCursorPos = m_data->size(); m_displayCursorPos = propertyValue->size();
} else if (gale::key::status_down == _event.getStatus()) { } else if (gale::key::status_down == _event.getStatus()) {
keepFocus(); keepFocus();
updateCursorPosition(_event.getPos()); updateCursorPosition(_event.getPos());
@ -351,45 +334,44 @@ bool ewol::widget::Entry::onEventEntry(const ewol::event::Entry& _event) {
removeSelected(); removeSelected();
if( _event.getChar() == '\n' if( _event.getChar() == '\n'
|| _event.getChar() == '\r') { || _event.getChar() == '\r') {
signalEnter.emit(m_data); signalEnter.emit(propertyValue);
return true; return true;
} else if (_event.getChar() == 0x7F) { } else if (_event.getChar() == 0x7F) {
// SUPPR : // SUPPR :
if (m_data->size() > 0 && m_displayCursorPos < (int64_t)m_data->size()) { if (propertyValue->size() > 0 && m_displayCursorPos < (int64_t)propertyValue->size()) {
m_data->erase(m_displayCursorPos, 1); propertyValue->erase(m_displayCursorPos, 1);
m_displayCursorPos = std::max(m_displayCursorPos, 0); m_displayCursorPos = std::max(m_displayCursorPos, 0);
m_displayCursorPosSelection = m_displayCursorPos; m_displayCursorPosSelection = m_displayCursorPos;
} }
} else if (_event.getChar() == 0x08) { } else if (_event.getChar() == 0x08) {
// DEL : // DEL :
if (m_data->size() > 0 && m_displayCursorPos != 0) { if (propertyValue->size() > 0 && m_displayCursorPos != 0) {
m_data->erase(m_displayCursorPos-1, 1); propertyValue->erase(m_displayCursorPos-1, 1);
m_displayCursorPos--; m_displayCursorPos--;
m_displayCursorPos = std::max(m_displayCursorPos, 0); m_displayCursorPos = std::max(m_displayCursorPos, 0);
m_displayCursorPosSelection = m_displayCursorPos; m_displayCursorPosSelection = m_displayCursorPos;
} }
} else if(_event.getChar() >= 20) { } else if(_event.getChar() >= 20) {
if ((int64_t)m_data->size() > m_maxCharacter) { if ((int64_t)propertyValue->size() > propertyMaxCharacter) {
EWOL_INFO("Reject data for entry : '" << _event.getChar() << "'"); EWOL_INFO("Reject data for entry : '" << _event.getChar() << "'");
} else { } else {
std::string newData = m_data; std::string newData = propertyValue;
newData.insert(newData.begin()+m_displayCursorPos, _event.getChar()); newData.insert(newData.begin()+m_displayCursorPos, _event.getChar());
setInternalValue(newData); setInternalValue(newData);
if (m_data.get() == newData) { if (propertyValue.get() == newData) {
m_displayCursorPos++; m_displayCursorPos++;
m_displayCursorPosSelection = m_displayCursorPos; m_displayCursorPosSelection = m_displayCursorPos;
} }
} }
} }
signalModify.emit(m_data); signalModify.emit(propertyValue);
markToRedraw(); markToRedraw();
return true; return true;
} }
return false; return false;
} else { } else {
if(_event.getStatus() == gale::key::status_down) { if(_event.getStatus() == gale::key::status_down) {
switch (_event.getType()) switch (_event.getType()) {
{
case gale::key::keyboard_left: case gale::key::keyboard_left:
m_displayCursorPos--; m_displayCursorPos--;
break; break;
@ -400,12 +382,12 @@ bool ewol::widget::Entry::onEventEntry(const ewol::event::Entry& _event) {
m_displayCursorPos = 0; m_displayCursorPos = 0;
break; break;
case gale::key::keyboard_end: case gale::key::keyboard_end:
m_displayCursorPos = m_data->size(); m_displayCursorPos = propertyValue->size();
break; break;
default: default:
return false; return false;
} }
m_displayCursorPos = std::avg(0, m_displayCursorPos, (int32_t)m_data->size()); m_displayCursorPos = std::avg(0, m_displayCursorPos, (int32_t)propertyValue->size());
m_displayCursorPosSelection = m_displayCursorPos; m_displayCursorPosSelection = m_displayCursorPos;
markToRedraw(); markToRedraw();
return true; return true;
@ -415,25 +397,25 @@ bool ewol::widget::Entry::onEventEntry(const ewol::event::Entry& _event) {
} }
void ewol::widget::Entry::setInternalValue(const std::string& _newData) { void ewol::widget::Entry::setInternalValue(const std::string& _newData) {
std::string previous = m_data; std::string previous = propertyValue;
// check the RegExp : // check the RegExp :
if (_newData.size()>0) { if (_newData.size()>0) {
std::smatch resultMatch; std::smatch resultMatch;
std::regex_search(_newData.begin(), _newData.end(), resultMatch, m_regex, std::regex_constants::match_continuous); std::regex_search(_newData.begin(), _newData.end(), resultMatch, m_regex, std::regex_constants::match_continuous);
if (resultMatch.size() <= 0) { if (resultMatch.size() <= 0) {
EWOL_INFO("The input data does not match with the regExp '" << _newData << "' Regex='" << m_regexValue << "'" ); EWOL_INFO("The input data does not match with the regExp '" << _newData << "' Regex='" << propertyRegex << "'" );
return; return;
} }
if (_newData.begin() != resultMatch[0].first) { if (_newData.begin() != resultMatch[0].first) {
EWOL_INFO("The input data does not match with the regExp '" << _newData << "' Regex='" << m_regexValue << "' (start position error)" ); EWOL_INFO("The input data does not match with the regExp '" << _newData << "' Regex='" << propertyRegex << "' (start position error)" );
return; return;
} }
if (_newData.end() != resultMatch[0].second) { if (_newData.end() != resultMatch[0].second) {
EWOL_INFO("The input data does not match with the regExp '" << _newData << "' Regex='" << m_regexValue << "' (stop position error)" ); EWOL_INFO("The input data does not match with the regExp '" << _newData << "' Regex='" << propertyRegex << "' (stop position error)" );
return; return;
} }
} }
m_data = _newData; propertyValue.get() = _newData;
markToRedraw(); markToRedraw();
} }
@ -444,11 +426,11 @@ void ewol::widget::Entry::onEventClipboard(enum gale::context::clipBoard::clipbo
std::string tmpData = get(_clipboardID); std::string tmpData = get(_clipboardID);
// add it on the current display : // add it on the current display :
if (tmpData.size() != 0) { if (tmpData.size() != 0) {
std::string newData = m_data; std::string newData = propertyValue;
newData.insert(m_displayCursorPos, &tmpData[0]); newData.insert(m_displayCursorPos, &tmpData[0]);
setInternalValue(newData); setInternalValue(newData);
if (m_data.get() == newData) { if (propertyValue.get() == newData) {
if (m_data->size() == tmpData.size()) { if (propertyValue->size() == tmpData.size()) {
m_displayCursorPos = tmpData.size(); m_displayCursorPos = tmpData.size();
} else { } else {
m_displayCursorPos += tmpData.size(); m_displayCursorPos += tmpData.size();
@ -457,11 +439,11 @@ void ewol::widget::Entry::onEventClipboard(enum gale::context::clipBoard::clipbo
markToRedraw(); markToRedraw();
} }
} }
signalModify.emit(m_data); signalModify.emit(propertyValue);
} }
void ewol::widget::Entry::onCallbackEntryClean() { void ewol::widget::Entry::onCallbackEntryClean() {
m_data = ""; propertyValue = "";
m_displayStartPosition = 0; m_displayStartPosition = 0;
m_displayCursorPos = 0; m_displayCursorPos = 0;
m_displayCursorPosSelection = m_displayCursorPos; m_displayCursorPosSelection = m_displayCursorPos;
@ -471,7 +453,7 @@ void ewol::widget::Entry::onCallbackEntryClean() {
void ewol::widget::Entry::onCallbackCut() { void ewol::widget::Entry::onCallbackCut() {
copySelectionToClipBoard(gale::context::clipBoard::clipboardStd); copySelectionToClipBoard(gale::context::clipBoard::clipboardStd);
removeSelected(); removeSelected();
signalModify.emit(m_data); signalModify.emit(propertyValue);
} }
void ewol::widget::Entry::onCallbackCopy() { void ewol::widget::Entry::onCallbackCopy() {
@ -485,7 +467,7 @@ void ewol::widget::Entry::onCallbackPaste() {
void ewol::widget::Entry::onCallbackSelect(bool _all) { void ewol::widget::Entry::onCallbackSelect(bool _all) {
if(_all == true) { if(_all == true) {
m_displayCursorPosSelection = 0; m_displayCursorPosSelection = 0;
m_displayCursorPos = m_data->size(); m_displayCursorPos = propertyValue->size();
} else { } else {
m_displayCursorPosSelection = m_displayCursorPos; m_displayCursorPosSelection = m_displayCursorPos;
} }
@ -493,28 +475,28 @@ void ewol::widget::Entry::onCallbackSelect(bool _all) {
} }
void ewol::widget::Entry::markToUpdateTextPosition() { void ewol::widget::Entry::markToUpdateTextPosition() {
m_needUpdateTextPos=true; m_needUpdateTextPos = true;
} }
void ewol::widget::Entry::updateTextPosition() { void ewol::widget::Entry::updateTextPosition() {
if (false == m_needUpdateTextPos) { if (m_needUpdateTextPos == false) {
return; return;
} }
ewol::Padding padding = m_shaper->getPadding(); ewol::Padding padding = m_shaper.getPadding();
int32_t tmpSizeX = m_minSize.x(); int32_t tmpSizeX = m_minSize.x();
if (true == m_userFill->x()) { if (propertyFill->x() == true) {
tmpSizeX = m_size.x(); tmpSizeX = m_size.x();
} }
int32_t tmpUserSize = tmpSizeX - padding.x(); int32_t tmpUserSize = tmpSizeX - padding.x();
int32_t totalWidth = m_text.calculateSize(m_data).x(); int32_t totalWidth = m_text.calculateSize(propertyValue).x();
// Check if the data inside the display can be contain in the entry box // Check if the data inside the display can be contain in the entry box
if (totalWidth < tmpUserSize) { if (totalWidth < tmpUserSize) {
// all can be display : // all can be display :
m_displayStartPosition = 0; m_displayStartPosition = 0;
} else { } else {
// all can not be set : // all can not be set :
std::string tmpDisplay = std::string(m_data, 0, m_displayCursorPos); std::string tmpDisplay = std::string(propertyValue, 0, m_displayCursorPos);
int32_t pixelCursorPos = m_text.calculateSize(tmpDisplay).x(); int32_t pixelCursorPos = m_text.calculateSize(tmpDisplay).x();
// check if the Cussor is visible at 10px nearest the border : // check if the Cussor is visible at 10px nearest the border :
int32_t tmp1 = pixelCursorPos+m_displayStartPosition; int32_t tmp1 = pixelCursorPos+m_displayStartPosition;
@ -546,14 +528,14 @@ void ewol::widget::Entry::onLostFocus() {
} }
void ewol::widget::Entry::changeStatusIn(int32_t _newStatusId) { void ewol::widget::Entry::changeStatusIn(int32_t _newStatusId) {
if (true == m_shaper->changeStatusIn(_newStatusId) ) { if (m_shaper.changeStatusIn(_newStatusId) == true) {
periodicCallEnable(); periodicCallEnable();
markToRedraw(); markToRedraw();
} }
} }
void ewol::widget::Entry::periodicCall(const ewol::event::Time& _event) { void ewol::widget::Entry::periodicCall(const ewol::event::Time& _event) {
if (false == m_shaper->periodicCall(_event) ) { if (m_shaper.periodicCall(_event) == false) {
periodicCallDisable(); periodicCallDisable();
} }
markToRedraw(); markToRedraw();
@ -561,24 +543,36 @@ void ewol::widget::Entry::periodicCall(const ewol::event::Time& _event) {
void ewol::widget::Entry::onPropertyChangeValue(const eproperty::Ref& _paramPointer) { void ewol::widget::Entry::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::Widget::onPropertyChangeValue(_paramPointer); ewol::Widget::onPropertyChangeValue(_paramPointer);
if (_paramPointer == m_shaper) { if (_paramPointer == propertyShaper) {
m_colorIdTextFg = m_shaper->requestColor("text-foreground"); m_shaper.setSource(propertyShaper.get());
m_colorIdTextBg = m_shaper->requestColor("text-background"); m_colorIdTextFg = m_shaper.requestColor("text-foreground");
m_colorIdCursor = m_shaper->requestColor("text-cursor"); m_colorIdTextBg = m_shaper.requestColor("text-background");
m_colorIdSelection = m_shaper->requestColor("text-selection"); m_colorIdCursor = m_shaper.requestColor("text-cursor");
} else if (_paramPointer == m_data) { m_colorIdSelection = m_shaper.requestColor("text-selection");
// to late to update data ... with control. } else if (_paramPointer == propertyValue) {
markToRedraw(); std::string newData = propertyValue.get();
} else if (_paramPointer == m_maxCharacter) { if ((int64_t)newData.size() > propertyMaxCharacter) {
// nothing to do ... newData = std::string(newData, 0, propertyMaxCharacter);
} else if (_paramPointer == m_regexValue) { EWOL_DEBUG("Limit entry set of data... " << std::string(newData, propertyMaxCharacter));
try { }
m_regex.assign(m_regexValue.get(), std::regex_constants::optimize | std::regex_constants::ECMAScript); // set the value with the check of the RegExp ...
} catch (std::regex_error e) { setInternalValue(newData);
EWOL_ERROR("can not parse regex : '" << e.what() << "' for : " << m_regexValue); if (newData == propertyValue.get()) {
m_displayCursorPos = propertyValue->size();
m_displayCursorPosSelection = m_displayCursorPos;
EWOL_VERBOSE("Set : '" << newData << "'");
} }
markToRedraw(); markToRedraw();
} else if (_paramPointer == m_textWhenNothing) { } else if (_paramPointer == propertyMaxCharacter) {
// TODO : check nomber of char in the data
} else if (_paramPointer == propertyRegex) {
try {
m_regex.assign(propertyRegex.get(), std::regex_constants::optimize | std::regex_constants::ECMAScript);
} catch (std::regex_error e) {
EWOL_ERROR("can not parse regex : '" << e.what() << "' for : " << propertyRegex);
}
markToRedraw();
} else if (_paramPointer == propertyTextWhenNothing) {
markToRedraw(); markToRedraw();
} }
} }

17
ewol/widget/Entry.h
View File

@ -103,23 +103,6 @@ namespace ewol {
* @note This request a regeneration of the display * @note This request a regeneration of the display
*/ */
virtual void removeSelected(); virtual void removeSelected();
private:
eproperty::Value<std::string> m_textWhenNothing; //!< Text to display when nothing in in the entry (decorated text...)
public:
/**
* @brief set The text displayed when nothing is in the entry.
* @param _text Text to display when the entry box is empty (this text can be decorated).
*/
void setEmptyText(const std::string& _text) {
m_textWhenNothing.set(_text);
}
/**
* @brief get The text displayed when nothing is in the entry.
* @return Text display when nothing
*/
const std::string& getEmptyText() const {
return m_textWhenNothing;
};
public: // Derived function public: // Derived function
virtual void onRegenerateDisplay(); virtual void onRegenerateDisplay();
virtual bool onEventInput(const ewol::event::Input& _event); virtual bool onEventInput(const ewol::event::Input& _event);

61
ewol/widget/Gird.cpp
View File

@ -52,7 +52,7 @@ void ewol::widget::Gird::onChangeSize() {
m_size -= m_borderSize*2; m_size -= m_borderSize*2;
for (size_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
if (nullptr != m_subWidget[iii].widget) { if (m_subWidget[iii].widget != nullptr) {
//calculate the origin : //calculate the origin :
vec2 tmpOrigin = m_origin + m_borderSize; vec2 tmpOrigin = m_origin + m_borderSize;
if (false == m_gavityButtom) { if (false == m_gavityButtom) {
@ -92,8 +92,8 @@ void ewol::widget::Gird::calculateMinMaxSize() {
} }
} }
//EWOL_DEBUG("Update minimum size"); //EWOL_DEBUG("Update minimum size");
m_minSize = m_userMinSize->getPixel(); m_minSize = propertyMinSize->getPixel();
m_maxSize = m_userMaxSize->getPixel(); m_maxSize = propertyMaxSize->getPixel();
m_uniformSizeRow = 0; m_uniformSizeRow = 0;
m_minSize += m_borderSize*2; m_minSize += m_borderSize*2;
int32_t lastLineID = 0; int32_t lastLineID = 0;
@ -102,7 +102,7 @@ void ewol::widget::Gird::calculateMinMaxSize() {
// change of line : // change of line :
lastLineID = m_subWidget[iii].row; lastLineID = m_subWidget[iii].row;
} }
if (nullptr != m_subWidget[iii].widget) { if (m_subWidget[iii].widget != nullptr) {
m_subWidget[iii].widget->calculateMinMaxSize(); m_subWidget[iii].widget->calculateMinMaxSize();
vec2 tmpSize = m_subWidget[iii].widget->getCalculateMinSize(); vec2 tmpSize = m_subWidget[iii].widget->getCalculateMinSize();
EWOL_DEBUG(" [" << iii << "] subWidgetMinSize=" << tmpSize); EWOL_DEBUG(" [" << iii << "] subWidgetMinSize=" << tmpSize);
@ -136,7 +136,7 @@ void ewol::widget::Gird::setColNumber(int32_t _colNumber) {
size_t errorControl = m_subWidget.size(); size_t errorControl = m_subWidget.size();
// remove subWidget : // remove subWidget :
for (int64_t iii=m_subWidget.size(); iii >= 0; iii--) { for (int64_t iii=m_subWidget.size(); iii >= 0; iii--) {
if (m_subWidget[iii].col>(_colNumber-1)) { if (m_subWidget[iii].col > (_colNumber-1)) {
// out of bounds : must remove it ... // out of bounds : must remove it ...
if (m_subWidget[iii].widget != nullptr) { if (m_subWidget[iii].widget != nullptr) {
m_subWidget[iii].widget.reset(); m_subWidget[iii].widget.reset();
@ -197,7 +197,7 @@ void ewol::widget::Gird::subWidgetRemoveAll() {
void ewol::widget::Gird::subWidgetAdd(int32_t _colId, int32_t _rowId, std::shared_ptr<ewol::Widget> _newWidget) { void ewol::widget::Gird::subWidgetAdd(int32_t _colId, int32_t _rowId, std::shared_ptr<ewol::Widget> _newWidget) {
if (nullptr == _newWidget) { if (_newWidget == nullptr) {
return; return;
} }
GirdProperties prop; GirdProperties prop;
@ -249,7 +249,8 @@ void ewol::widget::Gird::subWidgetRemove(std::shared_ptr<ewol::Widget> _newWidge
} }
void ewol::widget::Gird::subWidgetRemove(int32_t _colId, int32_t _rowId) { void ewol::widget::Gird::subWidgetRemove(int32_t _colId, int32_t _rowId) {
if (_colId<0 || _rowId<0) { if ( _colId < 0
|| _rowId < 0) {
EWOL_WARNING("[" << getId() << "] try to remove widget with id < 0 col=" << _colId << " row=" << _rowId); EWOL_WARNING("[" << getId() << "] try to remove widget with id < 0 col=" << _colId << " row=" << _rowId);
return; return;
} }
@ -266,7 +267,7 @@ void ewol::widget::Gird::subWidgetRemove(int32_t _colId, int32_t _rowId) {
} }
void ewol::widget::Gird::subWidgetUnLink(std::shared_ptr<ewol::Widget> _newWidget) { void ewol::widget::Gird::subWidgetUnLink(std::shared_ptr<ewol::Widget> _newWidget) {
if (nullptr == _newWidget) { if (_newWidget == nullptr) {
return; return;
} }
for (size_t iii=0; iii<m_subWidget.size(); iii++) { for (size_t iii=0; iii<m_subWidget.size(); iii++) {
@ -278,7 +279,8 @@ void ewol::widget::Gird::subWidgetUnLink(std::shared_ptr<ewol::Widget> _newWidge
} }
void ewol::widget::Gird::subWidgetUnLink(int32_t _colId, int32_t _rowId) { void ewol::widget::Gird::subWidgetUnLink(int32_t _colId, int32_t _rowId) {
if (_colId<0 || _rowId<0) { if ( _colId < 0
|| _rowId < 0) {
EWOL_WARNING("[" << getId() << "] try to Unlink widget with id < 0 col=" << _colId << " row=" << _rowId); EWOL_WARNING("[" << getId() << "] try to Unlink widget with id < 0 col=" << _colId << " row=" << _rowId);
return; return;
} }
@ -295,41 +297,42 @@ void ewol::widget::Gird::subWidgetUnLink(int32_t _colId, int32_t _rowId) {
void ewol::widget::Gird::systemDraw(const ewol::DrawProperty& _displayProp) { void ewol::widget::Gird::systemDraw(const ewol::DrawProperty& _displayProp) {
ewol::Widget::systemDraw(_displayProp); ewol::Widget::systemDraw(_displayProp);
for (size_t iii=0; iii<m_subWidget.size(); iii++) { for (auto &it : m_subWidget) {
if (nullptr != m_subWidget[iii].widget) { if (it.widget != nullptr) {
m_subWidget[iii].widget->systemDraw(_displayProp); it.widget->systemDraw(_displayProp);
} }
} }
} }
void ewol::widget::Gird::onRegenerateDisplay() { void ewol::widget::Gird::onRegenerateDisplay() {
for (size_t iii=0; iii<m_subWidget.size(); iii++) { for (auto &it : m_subWidget) {
if (nullptr != m_subWidget[iii].widget) { if (it.widget != nullptr) {
m_subWidget[iii].widget->onRegenerateDisplay(); it.widget->onRegenerateDisplay();
} }
} }
} }
std::shared_ptr<ewol::Widget> ewol::widget::Gird::getWidgetAtPos(const vec2& _pos) { std::shared_ptr<ewol::Widget> ewol::widget::Gird::getWidgetAtPos(const vec2& _pos) {
if (true == isHide()) { if (propertyHide == true) {
return nullptr; return nullptr;
} }
// for all element in the sizer ... // for all element in the sizer ...
for (size_t iii=0; iii<m_subWidget.size(); iii++) { for (auto &it : m_subWidget) {
if (nullptr != m_subWidget[iii].widget) { if (it.widget == nullptr) {
vec2 tmpSize = m_subWidget[iii].widget->getSize(); continue;
vec2 tmpOrigin = m_subWidget[iii].widget->getOrigin(); }
if( (tmpOrigin.x() <= _pos.x() && tmpOrigin.x() + tmpSize.x() >= _pos.x()) vec2 tmpSize = it.widget->getSize();
&& (tmpOrigin.y() <= _pos.y() && tmpOrigin.y() + tmpSize.y() >= _pos.y()) ) vec2 tmpOrigin = it.widget->getOrigin();
{ if( (tmpOrigin.x() <= _pos.x() && tmpOrigin.x() + tmpSize.x() >= _pos.x())
std::shared_ptr<ewol::Widget> tmpWidget = m_subWidget[iii].widget->getWidgetAtPos(_pos); && (tmpOrigin.y() <= _pos.y() && tmpOrigin.y() + tmpSize.y() >= _pos.y()) ) {
if (nullptr != tmpWidget) { std::shared_ptr<ewol::Widget> tmpWidget = it.widget->getWidgetAtPos(_pos);
return tmpWidget; if (tmpWidget != nullptr) {
} return tmpWidget;
// stop searching
break;
} }
// stop searching
break;
} }
} }
return nullptr; return nullptr;
} }

186
ewol/widget/Image.cpp
View File

@ -18,16 +18,16 @@
ewol::widget::Image::Image() : ewol::widget::Image::Image() :
signalPressed(*this, "pressed", "Image is pressed"), signalPressed(*this, "pressed", "Image is pressed"),
propertySource(*this, "src", "", "Image source path"),
propertyBorder(*this, "border", vec2(0,0), "Border of the image"),
propertyImageSize(*this, "size", vec2(0,0), "Basic display size of the image"),
propertyKeepRatio(*this, "ratio", true, "Keep ratio of the image"),
propertyPosStart(*this, "part-start", vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(1.0f, 1.0f), "Start display position in the image"),
propertyPosStop(*this, "part-stop", vec2(1.0f, 1.0f), vec2(0.0f, 0.0f), vec2(1.0f, 1.0f), "Start display position in the image"),
propertyDistanceFieldMode(*this, "distance-field", false, "Distance field mode"),
propertySmooth(*this, "smooth", true, "Smooth display of the image"),
m_colorProperty(nullptr), m_colorProperty(nullptr),
m_colorId(-1), m_colorId(-1) {
m_fileName(*this, "src", "", "Image source path"),
m_border(*this, "border", vec2(0,0), "Border of the image"),
m_imageSize(*this, "size", vec2(0,0), "Basic display size of the image"),
m_keepRatio(*this, "ratio", true, "Keep ratio of the image"),
m_posStart(*this, "part-start", vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(1.0f, 1.0f), "Start display position in the image"),
m_posStop(*this, "part-stop", vec2(1.0f, 1.0f), vec2(0.0f, 0.0f), vec2(1.0f, 1.0f), "Start display position in the image"),
m_distanceFieldMode(*this, "distance-field", false, "Distance field mode"),
m_smooth(*this, "smooth", true, "Smooth display of the image") {
addObjectType("ewol::widget::Image"); addObjectType("ewol::widget::Image");
m_imageRenderSize = vec2(0,0); m_imageRenderSize = vec2(0,0);
m_colorProperty = ewol::resource::ColorFile::create("{ewol}THEME:COLOR:Image.json"); m_colorProperty = ewol::resource::ColorFile::create("{ewol}THEME:COLOR:Image.json");
@ -48,8 +48,8 @@ ewol::widget::Image::~Image() {
void ewol::widget::Image::set(const std::string& _file, const gale::Dimension& _border) { void ewol::widget::Image::set(const std::string& _file, const gale::Dimension& _border) {
EWOL_VERBOSE("Set Image : " << _file << " border=" << _border); EWOL_VERBOSE("Set Image : " << _file << " border=" << _border);
m_border.set(_border); propertyBorder.set(_border);
m_fileName.set(_file); propertySource.set(_file);
} }
void ewol::widget::Image::onDraw() { void ewol::widget::Image::onDraw() {
@ -57,85 +57,86 @@ void ewol::widget::Image::onDraw() {
} }
void ewol::widget::Image::onRegenerateDisplay() { void ewol::widget::Image::onRegenerateDisplay() {
if (true == needRedraw()) { if (needRedraw() == false) {
// remove data of the previous composition : return;
m_compositing.clear();
if (m_colorProperty != nullptr) {
m_compositing.setColor(m_colorProperty->get(m_colorId));
}
// calculate the new position and size :
vec2 imageBoder = m_border->getPixel();
vec2 origin = imageBoder;
imageBoder *= 2.0f;
vec2 imageRealSize = m_imageRenderSize - imageBoder;
vec2 imageRealSizeMax = m_size - imageBoder;
vec2 ratioSizeDisplayRequested = m_posStop.get() - m_posStart.get();
//imageRealSizeMax *= ratioSizeDisplayRequested;
vec2 delta = ewol::gravityGenerateDelta(m_gravity, m_size-m_imageRenderSize);
if (m_userFill->x() == true) {
imageRealSize.setX(imageRealSizeMax.x());
delta.setX(0.0);
}
if (m_userFill->y() == true) {
imageRealSize.setY(imageRealSizeMax.y());
delta.setY(0.0);
}
origin += delta;
if (m_keepRatio == true) {
vec2 tmpSize = m_compositing.getRealSize();
//float ratio = tmpSize.x() / tmpSize.y();
float ratio = (tmpSize.x()*ratioSizeDisplayRequested.x()) / (tmpSize.y() * ratioSizeDisplayRequested.y());
//float ratioCurrent = (imageRealSize.x()*ratioSizeDisplayRequested.x()) / (imageRealSize.y() * ratioSizeDisplayRequested.y());
float ratioCurrent = imageRealSize.x() / imageRealSize.y();
if (ratio == ratioCurrent) {
// nothing to do ...
} else if (ratio < ratioCurrent) {
float oldX = imageRealSize.x();
imageRealSize.setX(imageRealSize.y()*ratio);
origin += vec2((oldX - imageRealSize.x()) * 0.5f, 0);
} else {
float oldY = imageRealSize.y();
imageRealSize.setY(imageRealSize.x()/ratio);
origin += vec2(0, (oldY - imageRealSize.y()) * 0.5f);
}
}
// set the somposition properties :
if (m_smooth.get() == true) {
m_compositing.setPos(origin);
} else {
m_compositing.setPos(ivec2(origin));
}
m_compositing.printPart(imageRealSize, m_posStart, m_posStop);
//EWOL_DEBUG("Paint Image at : " << origin << " size=" << imageRealSize << " origin=" << origin);
EWOL_VERBOSE("Paint Image :" << m_fileName << " realsize=" << m_compositing.getRealSize() << " size=" << imageRealSize);
} }
// remove data of the previous composition :
m_compositing.clear();
if (m_colorProperty != nullptr) {
m_compositing.setColor(m_colorProperty->get(m_colorId));
}
// calculate the new position and size :
vec2 imageBoder = propertyBorder->getPixel();
vec2 origin = imageBoder;
imageBoder *= 2.0f;
vec2 imageRealSize = m_imageRenderSize - imageBoder;
vec2 imageRealSizeMax = m_size - imageBoder;
vec2 ratioSizeDisplayRequested = propertyPosStop.get() - propertyPosStart.get();
//imageRealSizeMax *= ratioSizeDisplayRequested;
vec2 delta = ewol::gravityGenerateDelta(propertyGravity, m_size-m_imageRenderSize);
if (propertyFill->x() == true) {
imageRealSize.setX(imageRealSizeMax.x());
delta.setX(0.0);
}
if (propertyFill->y() == true) {
imageRealSize.setY(imageRealSizeMax.y());
delta.setY(0.0);
}
origin += delta;
if (propertyKeepRatio == true) {
vec2 tmpSize = m_compositing.getRealSize();
//float ratio = tmpSize.x() / tmpSize.y();
float ratio = (tmpSize.x()*ratioSizeDisplayRequested.x()) / (tmpSize.y() * ratioSizeDisplayRequested.y());
//float ratioCurrent = (imageRealSize.x()*ratioSizeDisplayRequested.x()) / (imageRealSize.y() * ratioSizeDisplayRequested.y());
float ratioCurrent = imageRealSize.x() / imageRealSize.y();
if (ratio == ratioCurrent) {
// nothing to do ...
} else if (ratio < ratioCurrent) {
float oldX = imageRealSize.x();
imageRealSize.setX(imageRealSize.y()*ratio);
origin += vec2((oldX - imageRealSize.x()) * 0.5f, 0);
} else {
float oldY = imageRealSize.y();
imageRealSize.setY(imageRealSize.x()/ratio);
origin += vec2(0, (oldY - imageRealSize.y()) * 0.5f);
}
}
// set the somposition properties :
if (propertySmooth.get() == true) {
m_compositing.setPos(origin);
} else {
m_compositing.setPos(ivec2(origin));
}
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);
} }
void ewol::widget::Image::calculateMinMaxSize() { void ewol::widget::Image::calculateMinMaxSize() {
vec2 imageBoder = m_border->getPixel()*2.0f; vec2 imageBoder = propertyBorder->getPixel()*2.0f;
vec2 imageSize = m_imageSize->getPixel(); vec2 imageSize = propertyImageSize->getPixel();
vec2 size = m_userMinSize->getPixel(); vec2 size = propertyMinSize->getPixel();
if (imageSize != vec2(0,0)) { if (imageSize != vec2(0,0)) {
m_minSize = imageBoder+imageSize; m_minSize = imageBoder+imageSize;
m_maxSize = m_minSize; m_maxSize = m_minSize;
} else { } else {
vec2 imageSizeReal = m_compositing.getRealSize(); vec2 imageSizeReal = m_compositing.getRealSize();
vec2 min1 = imageBoder+m_userMinSize->getPixel(); vec2 min1 = imageBoder+propertyMinSize->getPixel();
m_minSize = imageBoder+imageSizeReal; m_minSize = imageBoder+imageSizeReal;
//EWOL_DEBUG(" set max : " << m_minSize << " " << min1); //EWOL_DEBUG(" set max : " << m_minSize << " " << min1);
m_minSize.setMax(min1); m_minSize.setMax(min1);
//EWOL_DEBUG(" result : " << m_minSize); //EWOL_DEBUG(" result : " << m_minSize);
m_maxSize = imageBoder+m_userMaxSize->getPixel(); m_maxSize = imageBoder+propertyMaxSize->getPixel();
m_minSize.setMin(m_maxSize); m_minSize.setMin(m_maxSize);
} }
m_imageRenderSize = m_minSize; m_imageRenderSize = m_minSize;
m_minSize.setMax(size); m_minSize.setMax(size);
m_maxSize.setMax(m_minSize); m_maxSize.setMax(m_minSize);
//EWOL_ERROR("set widget min=" << m_minSize << " max=" << m_maxSize << " with real Image size=" << m_imageRenderSize << " img size=" << imageSize << " " << m_imageSize); //EWOL_ERROR("set widget min=" << m_minSize << " max=" << m_maxSize << " with real Image size=" << m_imageRenderSize << " img size=" << imageSize << " " << propertyImageSize);
markToRedraw(); markToRedraw();
} }
@ -161,34 +162,34 @@ bool ewol::widget::Image::loadXML(const std::shared_ptr<const exml::Element>& _n
std::string tmpAttributeValue = _node->getAttribute("ratio"); std::string tmpAttributeValue = _node->getAttribute("ratio");
if (tmpAttributeValue.size() != 0) { if (tmpAttributeValue.size() != 0) {
if (etk::compare_no_case(tmpAttributeValue, "true") == true) { if (etk::compare_no_case(tmpAttributeValue, "true") == true) {
m_keepRatio = true; propertyKeepRatio = true;
} else if (tmpAttributeValue == "1") { } else if (tmpAttributeValue == "1") {
m_keepRatio = true; propertyKeepRatio = true;
} else { } else {
m_keepRatio = false; propertyKeepRatio = false;
} }
} }
tmpAttributeValue = _node->getAttribute("size"); tmpAttributeValue = _node->getAttribute("size");
if (tmpAttributeValue.size() != 0) { if (tmpAttributeValue.size() != 0) {
//EWOL_CRITICAL(" Parse SIZE : " << tmpAttributeValue); //EWOL_CRITICAL(" Parse SIZE : " << tmpAttributeValue);
m_imageSize = tmpAttributeValue; propertyImageSize = tmpAttributeValue;
//EWOL_CRITICAL(" == > " << m_imageSize); //EWOL_CRITICAL(" == > " << propertyImageSize);
} }
tmpAttributeValue = _node->getAttribute("border"); tmpAttributeValue = _node->getAttribute("border");
if (tmpAttributeValue.size() != 0) { if (tmpAttributeValue.size() != 0) {
m_border = tmpAttributeValue; propertyBorder = tmpAttributeValue;
} }
tmpAttributeValue = _node->getAttribute("smooth"); tmpAttributeValue = _node->getAttribute("smooth");
if (tmpAttributeValue.size() != 0) { if (tmpAttributeValue.size() != 0) {
m_smooth = etk::string_to_bool(tmpAttributeValue); propertySmooth = etk::string_to_bool(tmpAttributeValue);
} }
//EWOL_DEBUG("Load label:" << node->ToElement()->getText()); //EWOL_DEBUG("Load label:" << node->ToElement()->getText());
if (_node->size() != 0) { if (_node->size() != 0) {
setFile(_node->getText()); propertySource.set(_node->getText());
} else { } else {
tmpAttributeValue = _node->getAttribute("src"); tmpAttributeValue = _node->getAttribute("src");
if (tmpAttributeValue.size() != 0) { if (tmpAttributeValue.size() != 0) {
setFile(tmpAttributeValue); propertySource.set(tmpAttributeValue);
} }
} }
return true; return true;
@ -196,21 +197,24 @@ bool ewol::widget::Image::loadXML(const std::shared_ptr<const exml::Element>& _n
void ewol::widget::Image::onPropertyChangeValue(const eproperty::Ref& _paramPointer) { void ewol::widget::Image::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::Widget::onPropertyChangeValue(_paramPointer); ewol::Widget::onPropertyChangeValue(_paramPointer);
if ( _paramPointer == m_fileName if ( _paramPointer == propertySource
|| _paramPointer == m_imageSize) { || _paramPointer == propertyImageSize) {
markToRedraw(); markToRedraw();
requestUpdateSize(); requestUpdateSize();
EWOL_VERBOSE("Set sources : " << m_fileName << " size=" << m_imageSize); EWOL_VERBOSE("Set sources : " << propertySource << " size=" << propertyImageSize);
m_compositing.setSource(m_fileName, m_imageSize->getPixel()); m_compositing.setSource(propertySource, propertyImageSize->getPixel());
} else if ( _paramPointer == m_border } else if ( _paramPointer == propertyBorder
|| _paramPointer == m_keepRatio || _paramPointer == propertyKeepRatio
|| _paramPointer == m_posStart || _paramPointer == propertyPosStart
|| _paramPointer == m_posStop) { || _paramPointer == propertyPosStop) {
markToRedraw(); markToRedraw();
requestUpdateSize(); requestUpdateSize();
} else if (_paramPointer == m_distanceFieldMode) { } else if (_paramPointer == propertyDistanceFieldMode) {
markToRedraw(); markToRedraw();
} else if (_paramPointer == m_smooth) { } else if (_paramPointer == propertySmooth) {
markToRedraw();
} else if (_paramPointer == propertyDistanceFieldMode) {
m_compositing.setDistanceFieldMode(propertyDistanceFieldMode.get());
markToRedraw(); markToRedraw();
} }
} }

137
ewol/widget/Image.h
View File

@ -21,9 +21,17 @@ namespace ewol {
* @ingroup ewolWidgetGroup * @ingroup ewolWidgetGroup
*/ */
class Image :public ewol::Widget { class Image :public ewol::Widget {
public: public: // signals
// Event list of properties
esignal::Signal<void> signalPressed; esignal::Signal<void> signalPressed;
public: // properties
eproperty::Value<std::string> propertySource; //!< file name of the image.
eproperty::Value<gale::Dimension> propertyBorder; //!< border to add at the image.
eproperty::Value<gale::Dimension> propertyImageSize; //!< border to add at the image.
eproperty::Value<bool> propertyKeepRatio; //!< keep the image ratio between width and hight
eproperty::Range<vec2> propertyPosStart; //!< position in the image to start the sisplay (when we want not to display all the image)
eproperty::Range<vec2> propertyPosStop; //!< position in the image to start the sisplay (when we want not to display all the image)
eproperty::Value<bool> propertyDistanceFieldMode; //!< to have a parameter
eproperty::Value<bool> propertySmooth; //!< display is done in the pixed approximation if false
protected: protected:
ewol::compositing::Image m_compositing; //!< compositing element of the image. ewol::compositing::Image m_compositing; //!< compositing element of the image.
std::shared_ptr<ewol::resource::ColorFile> m_colorProperty; //!< theme color property std::shared_ptr<ewol::resource::ColorFile> m_colorProperty; //!< theme color property
@ -48,132 +56,7 @@ namespace ewol {
*/ */
void set(const std::string& _file, const gale::Dimension& _border); void set(const std::string& _file, const gale::Dimension& _border);
protected: protected:
eproperty::Value<std::string> m_fileName; //!< file name of the image.
public:
/**
* @brief set the new filename
* @param[in] _file Filaneme of the new image
*/
void setFile(const std::string& _file) {
m_fileName.set(_file);
}
/**
* @brief get the file displayed
* @return the filename of the image
*/
const std::string& getFile() const {
return m_fileName;
};
protected:
eproperty::Value<gale::Dimension> m_border; //!< border to add at the image.
public:
/**
* @brief set tge Border size around the image
* @param[in] _border New border size to set
*/
void setBorder(const gale::Dimension& _border);
/**
* @brief get the current border request at the image
* @return the border size
*/
const gale::Dimension& getBorder() const {
return m_border;
};
protected:
eproperty::Value<gale::Dimension> m_imageSize; //!< border to add at the image.
vec2 m_imageRenderSize; //!< size of the image when we render it vec2 m_imageRenderSize; //!< size of the image when we render it
public:
/**
* @brief set tge Border size around the image
* @param[in] _size New border size to set
*/
void setImageSize(const gale::Dimension& _size);
/**
* @brief get the current border request at the image
* @return the border size
*/
const gale::Dimension& getImageSize() const {
return m_imageSize;
};
protected:
eproperty::Value<bool> m_keepRatio; //!< keep the image ratio between width and hight
public:
/**
* @brief set the current status of keeping ratio.
* @param[in] _keep The new status of keeping the ratio of this image.
*/
void setKeepRatio(bool _keep);
/**
* @brief get the current status of keeping ratio.
* @return The status of keeping the ratio of this image.
*/
bool getKeepRatio() const {
return m_keepRatio;
};
protected:
eproperty::Range<vec2> m_posStart; //!< position in the image to start the sisplay (when we want not to display all the image)
public:
/**
* @brief set the current 'start' position in the image to display.
* @param[in] _keep The new position in the image vec2([0..1],[0..1])
*/
void setStartPos(const vec2& _pos);
/**
* @brief get the current 'start' position in the image to display.
* @return The Position of the display in image
*/
vec2 getStartPos() const {
return m_posStart;
};
protected:
eproperty::Range<vec2> m_posStop; //!< position in the image to start the sisplay (when we want not to display all the image)
public:
/**
* @brief set the current 'stop' position in the image to display.
* @param[in] _keep The new position in the image vec2([0..1],[0..1])
*/
void setStopPos(const vec2& _pos);
/**
* @brief get the current 'stop' position in the image to display.
* @return The Position of the display in image
*/
vec2 getStopPos() const {
return m_posStop;
};
protected:
eproperty::Value<bool> m_distanceFieldMode; //!< to have a parameter
public:
/**
* @brief Set distance field rendering mode
* @param[in] _df enable distance field
*/
void setDistanceField(bool _df) {
m_compositing.setDistanceFieldMode(_df);
}
/**
* @brief Get the distance field render mode.
* @return Status of the distance field render mode.
*/
bool getDistanceField() const {
return m_compositing.getDistanceFieldMode();
}
protected:
eproperty::Value<bool> m_smooth; //!< display is done in the pixed approximation if false
public:
/**
* @brief Set smooth rendering mode
* @param[in] _value enable smooting of the display
*/
void setSmooth(bool _value) {
m_smooth.set(_value);
}
/**
* @brief Get smooth rendering mode
* @return Status of the smooting render mode.
*/
bool getSmooth() const {
return m_smooth;
}
protected: // Derived function protected: // Derived function
virtual void onDraw(); virtual void onDraw();
virtual void onPropertyChangeValue(const eproperty::Ref& _paramPointer); virtual void onPropertyChangeValue(const eproperty::Ref& _paramPointer);

2
ewol/widget/Joystick.cpp
View File

@ -43,11 +43,11 @@ ewol::widget::Joystick::Joystick() :
m_background = l_background; m_background = l_background;
m_foreground = l_foreground; m_foreground = l_foreground;
m_ratio = l_ratio; m_ratio = l_ratio;
setCanHaveFocus(true);
} }
void ewol::widget::Joystick::init() { void ewol::widget::Joystick::init() {
ewol::Widget::init(); ewol::Widget::init();
propertyCanFocus.set(true);
} }

1
ewol/widget/Joystick.h
View File

@ -13,6 +13,7 @@
#include <ewol/widget/Widget.h> #include <ewol/widget/Widget.h>
#include <esignal/Signal.h> #include <esignal/Signal.h>
// TODO : Rework ==> use property and shaper ...
namespace ewol { namespace ewol {
namespace widget { namespace widget {

32
ewol/widget/Label.cpp
View File

@ -18,7 +18,8 @@
// TODO : Remove the label name in the constructor ... // TODO : Remove the label name in the constructor ...
ewol::widget::Label::Label() : ewol::widget::Label::Label() :
signalPressed(*this, "pressed"), signalPressed(*this, "pressed"),
m_label(*this, "value", U"", "displayed value string"), propertyValue(*this, "value", "", "displayed value string"),
m_value(U""),
m_colorProperty(nullptr), m_colorProperty(nullptr),
m_colorDefaultFgText(-1), m_colorDefaultFgText(-1),
m_colorDefaultBgText(-1){ m_colorDefaultBgText(-1){
@ -28,13 +29,13 @@ ewol::widget::Label::Label() :
m_colorDefaultFgText = m_colorProperty->request("foreground"); m_colorDefaultFgText = m_colorProperty->request("foreground");
m_colorDefaultBgText = m_colorProperty->request("background"); m_colorDefaultBgText = m_colorProperty->request("background");
} }
setCanHaveFocus(false);
setMouseLimit(1); setMouseLimit(1);
} }
void ewol::widget::Label::init(std::string _newLabel) { void ewol::widget::Label::init(std::string _newLabel) {
ewol::Widget::init(); ewol::Widget::init();
m_label.setString(_newLabel); propertyCanFocus.set(false);
propertyValue.set(_newLabel);
} }
ewol::widget::Label::~Label() { ewol::widget::Label::~Label() {
@ -42,14 +43,14 @@ ewol::widget::Label::~Label() {
} }
void ewol::widget::Label::calculateMinMaxSize() { void ewol::widget::Label::calculateMinMaxSize() {
vec2 tmpMax = m_userMaxSize->getPixel(); vec2 tmpMax = propertyMaxSize->getPixel();
vec2 tmpMin = m_userMinSize->getPixel(); vec2 tmpMin = propertyMinSize->getPixel();
//EWOL_DEBUG("[" << getId() << "] {" << getObjectType() << "} tmpMax : " << tmpMax); //EWOL_DEBUG("[" << getId() << "] {" << getObjectType() << "} tmpMax : " << tmpMax);
if (tmpMax.x() <= 999999) { if (tmpMax.x() <= 999999) {
m_text.setTextAlignement(0, tmpMax.x()-4, ewol::compositing::alignLeft); m_text.setTextAlignement(0, tmpMax.x()-4, ewol::compositing::alignLeft);
//EWOL_DEBUG("[" << getId() << "] {" << getObjectType() << "} forcez Alignement "); //EWOL_DEBUG("[" << getId() << "] {" << getObjectType() << "} forcez Alignement ");
} }
vec3 minSize = m_text.calculateSizeDecorated(m_label.get()); vec3 minSize = m_text.calculateSizeDecorated(m_value);
//EWOL_DEBUG("[" << getId() << "] {" << getObjectType() << "} minSize : " << minSize); //EWOL_DEBUG("[" << getId() << "] {" << getObjectType() << "} minSize : " << minSize);
m_minSize.setX(std::avg(tmpMin.x(), 4 + minSize.x(), tmpMax.x())); m_minSize.setX(std::avg(tmpMin.x(), 4 + minSize.x(), tmpMax.x()));
@ -68,7 +69,7 @@ void ewol::widget::Label::onRegenerateDisplay() {
m_text.clear(); m_text.clear();
int32_t paddingSize = 2; int32_t paddingSize = 2;
vec2 tmpMax = m_userMaxSize->getPixel(); vec2 tmpMax = propertyMaxSize->getPixel();
// to know the size of one line : // to know the size of one line :
vec3 minSize = m_text.calculateSize(char32_t('A')); vec3 minSize = m_text.calculateSize(char32_t('A'));
@ -77,7 +78,7 @@ void ewol::widget::Label::onRegenerateDisplay() {
if (tmpMax.x() <= 999999) { if (tmpMax.x() <= 999999) {
m_text.setTextAlignement(0, tmpMax.x()-2*paddingSize, ewol::compositing::alignLeft); m_text.setTextAlignement(0, tmpMax.x()-2*paddingSize, ewol::compositing::alignLeft);
} }
vec3 curentTextSize = m_text.calculateSizeDecorated(m_label.get()); vec3 curentTextSize = m_text.calculateSizeDecorated(m_value);
ivec2 localSize = m_minSize; ivec2 localSize = m_minSize;
@ -86,11 +87,11 @@ void ewol::widget::Label::onRegenerateDisplay() {
(m_size.y() - m_minSize.y()) / 2.0, (m_size.y() - m_minSize.y()) / 2.0,
0); 0);
if (m_userFill->x() == true) { if (propertyFill->x() == true) {
localSize.setX(m_size.x()); localSize.setX(m_size.x());
tmpTextOrigin.setX(0); tmpTextOrigin.setX(0);
} }
if (m_userFill->y() == true) { if (propertyFill->y() == true) {
localSize.setY(m_size.y()); localSize.setY(m_size.y());
tmpTextOrigin.setY(m_size.y() - 2*paddingSize - curentTextSize.y()); tmpTextOrigin.setY(m_size.y() - 2*paddingSize - curentTextSize.y());
} }
@ -113,15 +114,15 @@ void ewol::widget::Label::onRegenerateDisplay() {
m_text.setDefaultColorBg(m_colorProperty->get(m_colorDefaultBgText)); m_text.setDefaultColorBg(m_colorProperty->get(m_colorDefaultBgText));
} }
m_text.setPos(tmpTextOrigin); m_text.setPos(tmpTextOrigin);
EWOL_VERBOSE("[" << getId() << "] {" << m_label.get() << "} display at pos : " << tmpTextOrigin); EWOL_VERBOSE("[" << getId() << "] {" << m_value << "} display at pos : " << tmpTextOrigin);
m_text.setTextAlignement(tmpTextOrigin.x(), tmpTextOrigin.x()+localSize.x(), ewol::compositing::alignLeft); m_text.setTextAlignement(tmpTextOrigin.x(), tmpTextOrigin.x()+localSize.x(), ewol::compositing::alignLeft);
m_text.setClipping(drawClippingPos, drawClippingSize); m_text.setClipping(drawClippingPos, drawClippingSize);
m_text.printDecorated(m_label.get()); m_text.printDecorated(m_value);
} }
bool ewol::widget::Label::onEventInput(const ewol::event::Input& _event) { bool ewol::widget::Label::onEventInput(const ewol::event::Input& _event) {
//EWOL_DEBUG("Event on Label ..."); //EWOL_DEBUG("Event on Label ...");
if (1 == _event.getId()) { if (_event.getId() == 1) {
if (gale::key::status_single == _event.getStatus()) { if (gale::key::status_single == _event.getStatus()) {
// nothing to do ... // nothing to do ...
signalPressed.emit(); signalPressed.emit();
@ -138,13 +139,14 @@ bool ewol::widget::Label::loadXML(const std::shared_ptr<const exml::Element>& _n
ewol::Widget::loadXML(_node); ewol::Widget::loadXML(_node);
// get internal data : // get internal data :
EWOL_DEBUG("Load label:" << _node->getText()); EWOL_DEBUG("Load label:" << _node->getText());
setLabel(_node->getText()); propertyValue.set(_node->getText());
return true; return true;
} }
void ewol::widget::Label::onPropertyChangeValue(const eproperty::Ref& _paramPointer) { void ewol::widget::Label::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::Widget::onPropertyChangeValue(_paramPointer); ewol::Widget::onPropertyChangeValue(_paramPointer);
if (_paramPointer == m_label) { if (_paramPointer == propertyValue) {
m_value = etk::to_u32string(propertyValue.get());
markToRedraw(); markToRedraw();
requestUpdateSize(); requestUpdateSize();
} }

29
ewol/widget/Label.h
View File

@ -21,12 +21,13 @@ namespace ewol {
* @ingroup ewolWidgetGroup * @ingroup ewolWidgetGroup
*/ */
class Label : public ewol::Widget { class Label : public ewol::Widget {
public: public: // signals
// Event list of properties
esignal::Signal<void> signalPressed; esignal::Signal<void> signalPressed;
public: // properties
eproperty::Value<std::string> propertyValue; //!< decorated text to display.
private: private:
ewol::compositing::Text m_text; //!< Compositing text element. ewol::compositing::Text m_text; //!< Compositing text element.
eproperty::Value<std::u32string> m_label; //!< decorated text to display. std::u32string m_value;
std::shared_ptr<ewol::resource::ColorFile> m_colorProperty; //!< theme color property std::shared_ptr<ewol::resource::ColorFile> m_colorProperty; //!< theme color property
int32_t m_colorDefaultFgText; //!< Default color of the text int32_t m_colorDefaultFgText; //!< Default color of the text
int32_t m_colorDefaultBgText; //!< Default Background color of the text int32_t m_colorDefaultBgText; //!< Default Background color of the text
@ -43,28 +44,6 @@ namespace ewol {
* @brief destructor * @brief destructor
*/ */
virtual ~Label(); virtual ~Label();
/**
* @brief change the label displayed
* @param[in] _newLabel The displayed decorated text.
*/
void setLabel(const std::string& _newLabel) {
m_label.set(etk::to_u32string(_newLabel));
}
//! @previous
inline void setValue(const std::string& _newLabel) {
m_label.set(etk::to_u32string(_newLabel));
};
/**
* @brief get the current displayed label
* @return The displayed decorated text.
*/
std::string getLabel() const {
return etk::to_string(m_label);
}
//! @previous
inline std::string getValue() const {
return etk::to_string(m_label);
};
protected: // Derived function protected: // Derived function
virtual void onDraw(); virtual void onDraw();
virtual void onPropertyChangeValue(const eproperty::Ref& _paramPointer); virtual void onPropertyChangeValue(const eproperty::Ref& _paramPointer);

7
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) { std::shared_ptr<ewol::Widget> ewol::widget::Layer::getWidgetAtPos(const vec2& _pos) {
if (true == isHide()) { if (propertyHide == true) {
return nullptr; return nullptr;
} }
// for all element in the sizer ... // for all element in the sizer ...
@ -37,10 +37,9 @@ std::shared_ptr<ewol::Widget> ewol::widget::Layer::getWidgetAtPos(const vec2& _p
vec2 tmpSize = it->getSize(); vec2 tmpSize = it->getSize();
vec2 tmpOrigin = it->getOrigin(); vec2 tmpOrigin = it->getOrigin();
if( (tmpOrigin.x() <= _pos.x() && tmpOrigin.x() + tmpSize.x() >= _pos.x()) if( (tmpOrigin.x() <= _pos.x() && tmpOrigin.x() + tmpSize.x() >= _pos.x())
&& (tmpOrigin.y() <= _pos.y() && tmpOrigin.y() + tmpSize.y() >= _pos.y()) ) && (tmpOrigin.y() <= _pos.y() && tmpOrigin.y() + tmpSize.y() >= _pos.y()) ) {
{
std::shared_ptr<ewol::Widget> tmpWidget = it->getWidgetAtPos(_pos); std::shared_ptr<ewol::Widget> tmpWidget = it->getWidgetAtPos(_pos);
if (nullptr != tmpWidget) { if (tmpWidget != nullptr) {
return tmpWidget; return tmpWidget;
} }
// parse the next layer ... // parse the next layer ...

4
ewol/widget/List.cpp
View File

@ -24,12 +24,12 @@ ewol::widget::List::List() {
#else #else
m_paddingSizeY = 2; m_paddingSizeY = 2;
#endif #endif
m_nbVisibleRaw=0; m_nbVisibleRaw = 0;
setCanHaveFocus(true);
} }
void ewol::widget::List::init() { void ewol::widget::List::init() {
ewol::widget::WidgetScrolled::init(); ewol::widget::WidgetScrolled::init();
propertyCanFocus.set(true);
} }
ewol::widget::List::~List() { ewol::widget::List::~List() {

78
ewol/widget/ListFileSystem.cpp
View File

@ -20,16 +20,16 @@ ewol::widget::ListFileSystem::ListFileSystem() :
signalFileValidate(*this, "file-validate"), signalFileValidate(*this, "file-validate"),
signalFolderSelect(*this, "folder-select"), signalFolderSelect(*this, "folder-select"),
signalFolderValidate(*this, "folder-validate"), signalFolderValidate(*this, "folder-validate"),
m_selectedLine(-1), propertyPath(*this, "path", "/", "Path to display"),
m_folder(*this, "path", "/", "Path to display"), propertyFile(*this, "select", "", "selection af a specific file"),
m_selectFile(*this, "select", "", "selection af a specific file"), propertyShowFile(*this, "show-file", true, "display files"),
m_showFile(*this, "show-file", true, "display files"), propertyShowFolder(*this, "show-folder", true, "display folders"),
m_showFolder(*this, "show-folder", true, "display folders"), propertyShowHidden(*this, "show-hidden", true, "Show the hidden element (file, folder, ...)"),
m_showHidden(*this, "show-hidden", true, "Show the hidden element (file, folder, ...)"), propertyFilter(*this, "filter", "", "regex to filter files ..."),
m_showTemporaryFile(*this, "show-temporary", true, "display temporary files") { m_selectedLine(-1) {
addObjectType("ewol::widget::ListFileSystem"); addObjectType("ewol::widget::ListFileSystem");
#if defined(__TARGET_OS__Windows) #if defined(__TARGET_OS__Windows)
m_folder = "c:/"; propertyPath = "c:/";
#endif #endif
m_colorProperty = ewol::resource::ColorFile::create("{ewol}THEME:COLOR:ListFileSystem.json"); m_colorProperty = ewol::resource::ColorFile::create("{ewol}THEME:COLOR:ListFileSystem.json");
if (m_colorProperty != nullptr) { if (m_colorProperty != nullptr) {
@ -39,25 +39,25 @@ ewol::widget::ListFileSystem::ListFileSystem() :
m_colorIdBackgroundSelected = m_colorProperty->request("selected"); m_colorIdBackgroundSelected = m_colorProperty->request("selected");
} }
setMouseLimit(1); setMouseLimit(1);
}; }
void ewol::widget::ListFileSystem::init() { void ewol::widget::ListFileSystem::init() {
ewol::widget::List::init(); ewol::widget::List::init();
}; }
ewol::widget::ListFileSystem::~ListFileSystem() { ewol::widget::ListFileSystem::~ListFileSystem() {
clearList(); clearList();
}; }
void ewol::widget::ListFileSystem::clearList() { void ewol::widget::ListFileSystem::clearList() {
for (size_t iii=0; iii<m_list.size(); iii++) { for (auto &it : m_list) {
if (nullptr != m_list[iii]) { if (it != nullptr) {
delete(m_list[iii]); delete(it);
m_list[iii] = nullptr; it = nullptr;
} }
} }
}; }
etk::Color<> ewol::widget::ListFileSystem::getBasicBG() { etk::Color<> ewol::widget::ListFileSystem::getBasicBG() {
return m_colorProperty->get(m_colorIdBackground1); return m_colorProperty->get(m_colorIdBackground1);
@ -69,9 +69,9 @@ void ewol::widget::ListFileSystem::regenerateView() {
m_selectedLine = -1; m_selectedLine = -1;
m_list.clear(); m_list.clear();
m_originScrooled.setValue(0,0); m_originScrooled.setValue(0,0);
etk::FSNode tmpFolder(m_folder.get()); etk::FSNode tmpFolder(propertyPath.get());
// get the new list : // get the new list :
m_list = tmpFolder.folderGetSubList(m_showHidden, m_showFolder, m_showFile, m_showTemporaryFile); m_list = tmpFolder.folderGetSubList(propertyShowHidden, propertyShowFolder, propertyShowFile, propertyFilter);
// request a redraw ... // request a redraw ...
markToRedraw(); markToRedraw();
} }
@ -91,8 +91,8 @@ void ewol::widget::ListFileSystem::setSelect(const std::string& _data) {
// remove selected line // remove selected line
m_selectedLine = -1; m_selectedLine = -1;
// search the coresponding file : // search the coresponding file :
for (size_t iii=0; iii<m_list.size(); iii++) { for (size_t iii=0; iii<m_list.size(); ++iii) {
if (nullptr!=m_list[iii]) { if (m_list[iii] != nullptr) {
if (m_list[iii]->getNameFile() == _data) { if (m_list[iii]->getNameFile() == _data) {
// we find the line : // we find the line :
m_selectedLine = iii; m_selectedLine = iii;
@ -114,8 +114,8 @@ bool ewol::widget::ListFileSystem::getTitle(int32_t _colomn, std::string &_myTit
uint32_t ewol::widget::ListFileSystem::getNuberOfRaw() { uint32_t ewol::widget::ListFileSystem::getNuberOfRaw() {
int32_t offset = 0; int32_t offset = 0;
if (m_showFolder == true) { if (propertyShowFolder == true) {
if (m_folder.get() == "/") { if (propertyPath.get() == "/") {
offset = 1; offset = 1;
} else { } else {
offset = 2; offset = 2;
@ -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) { 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 (m_showFolder == true) { if (propertyShowFolder == true) {
if (m_folder.get() == "/") { if (propertyPath.get() == "/") {
offset = 1; offset = 1;
} else { } else {
offset = 2; offset = 2;
@ -135,13 +135,13 @@ bool ewol::widget::ListFileSystem::getElement(int32_t _colomn, int32_t _raw, std
if (_raw == 0) { if (_raw == 0) {
_myTextToWrite = "."; _myTextToWrite = ".";
} else if ( _raw == 1 } else if ( _raw == 1
&& m_folder.get() != "/") { && propertyPath.get() != "/") {
_myTextToWrite = ".."; _myTextToWrite = "..";
} }
} }
if( _raw-offset >= 0 if( _raw-offset >= 0
&& _raw-offset < (int32_t)m_list.size() && _raw-offset < (int32_t)m_list.size()
&& nullptr != m_list[_raw-offset]) { && m_list[_raw-offset] != nullptr) {
_myTextToWrite = m_list[_raw-offset]->getNameFile(); _myTextToWrite = m_list[_raw-offset]->getNameFile();
EWOL_VERBOSE("get filename for : '" << *m_list[_raw-offset] << ":'" << _myTextToWrite << "'"); EWOL_VERBOSE("get filename for : '" << *m_list[_raw-offset] << ":'" << _myTextToWrite << "'");
} }
@ -165,8 +165,8 @@ 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 (m_showFolder == true) { if (propertyShowFolder == true) {
if (m_folder.get() == "/") { if (propertyPath.get() == "/") {
offset = 1; offset = 1;
} else { } else {
offset = 2; offset = 2;
@ -182,11 +182,11 @@ bool ewol::widget::ListFileSystem::onItemEvent(int32_t _IdInput,
m_selectedLine = _raw; m_selectedLine = _raw;
} }
if (previousRaw != m_selectedLine) { if (previousRaw != m_selectedLine) {
if( m_showFolder == true if( propertyShowFolder == true
&& m_selectedLine == 0) { && m_selectedLine == 0) {
// "." folder // "." folder
signalFolderSelect.emit("."); signalFolderSelect.emit(".");
} else if ( m_showFolder == true } else if ( propertyShowFolder == true
&& m_selectedLine == 1) { && m_selectedLine == 1) {
// ".." folder // ".." folder
signalFolderSelect.emit(".."); signalFolderSelect.emit("..");
@ -207,11 +207,11 @@ bool ewol::widget::ListFileSystem::onItemEvent(int32_t _IdInput,
} }
} }
} else { } else {
if( m_showFolder == true if( propertyShowFolder == true
&& m_selectedLine == 0) { && m_selectedLine == 0) {
// "." folder // "." folder
signalFolderValidate.emit("."); signalFolderValidate.emit(".");
} else if ( m_showFolder == true } else if ( propertyShowFolder == true
&& m_selectedLine == 1) { && m_selectedLine == 1) {
// ".." folder // ".." folder
signalFolderValidate.emit(".."); signalFolderValidate.emit("..");
@ -241,17 +241,17 @@ bool ewol::widget::ListFileSystem::onItemEvent(int32_t _IdInput,
void ewol::widget::ListFileSystem::onPropertyChangeValue(const eproperty::Ref& _paramPointer) { void ewol::widget::ListFileSystem::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::widget::List::onPropertyChangeValue(_paramPointer); ewol::widget::List::onPropertyChangeValue(_paramPointer);
if (_paramPointer == m_folder) { if (_paramPointer == propertyPath) {
regenerateView(); regenerateView();
} else if (_paramPointer == m_selectFile) { } else if (_paramPointer == propertyFile) {
setSelect(m_selectFile); setSelect(propertyFile);
} else if (_paramPointer == m_showFile) { } else if (_paramPointer == propertyShowFile) {
regenerateView(); regenerateView();
} else if (_paramPointer == m_showFolder) { } else if (_paramPointer == propertyShowFolder) {
regenerateView(); regenerateView();
} else if (_paramPointer == m_showHidden) { } else if (_paramPointer == propertyShowHidden) {
regenerateView(); regenerateView();
} else if (_paramPointer == m_showTemporaryFile) { } else if (_paramPointer == propertyFilter) {
regenerateView(); regenerateView();
} }
} }

97
ewol/widget/ListFileSystem.h
View File

@ -18,12 +18,18 @@ namespace ewol {
* @brief Generic display folder class. This widget display the content of a single folder : * @brief Generic display folder class. This widget display the content of a single folder :
*/ */
class ListFileSystem : public ewol::widget::List { class ListFileSystem : public ewol::widget::List {
public: public: // signals
// Event list of properties
esignal::Signal<std::string> signalFileSelect; //!< @event "file-select" Generated when a file is selected. esignal::Signal<std::string> signalFileSelect; //!< @event "file-select" Generated when a file is selected.
esignal::Signal<std::string> signalFileValidate; //!< @event "file-validate" Generate when the user validate (return) or double click on the element esignal::Signal<std::string> signalFileValidate; //!< @event "file-validate" Generate when the user validate (return) or double click on the element
esignal::Signal<std::string> signalFolderSelect; esignal::Signal<std::string> signalFolderSelect;
esignal::Signal<std::string> signalFolderValidate; esignal::Signal<std::string> signalFolderValidate;
public: // properties
eproperty::Value<std::string> propertyPath; //!< Current folder that display point on.
eproperty::Value<std::string> propertyFile; //!< current selected file
eproperty::Value<bool> propertyShowFile; //!< Show files elements
eproperty::Value<bool> propertyShowFolder; //!< Display the folders elements
eproperty::Value<bool> propertyShowHidden; //!< Display hidden elements
eproperty::Value<std::string> propertyFilter; //!< Regular expression to filter the view (for temporary file:".*(~|.bck|.pyc)\e")
protected: protected:
ListFileSystem(); ListFileSystem();
void init(); void init();
@ -44,6 +50,7 @@ namespace ewol {
virtual bool getElement(int32_t _colomn, int32_t _raw, std::string& _myTextToWrite, etk::Color<>& _fg, etk::Color<>& _bg); virtual bool getElement(int32_t _colomn, int32_t _raw, std::string& _myTextToWrite, etk::Color<>& _fg, etk::Color<>& _bg);
virtual bool onItemEvent(int32_t _IdInput, enum gale::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y); virtual bool onItemEvent(int32_t _IdInput, enum gale::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y);
protected: protected:
// TODO: use shred_ptr
std::vector<etk::FSNode *> m_list; //!< List of all element in the path. (they are filtered) std::vector<etk::FSNode *> m_list; //!< List of all element in the path. (they are filtered)
/** /**
* @brief Clean the list of element. * @brief Clean the list of element.
@ -66,92 +73,6 @@ namespace ewol {
* @return the String of the element selected. * @return the String of the element selected.
*/ */
std::string getSelect() const ; std::string getSelect() const ;
protected:
eproperty::Value<std::string> m_folder; //!< Current folder that display point on.
eproperty::Value<std::string, true> m_selectFile; //!< current selected file
public:
/**
* @brief Set a folder to display (might be a valid folder !!!)
* @param[in] _newFolder Path on the folder to display content.
*/
void setFolder(const std::string& _newFolder) {
m_folder.set(_newFolder);
};
/**
* @brief Get the element current displaying folder path.
* @return Path on the folder.
*/
const std::string& getFolder() const {
return m_folder;
};
protected:
eproperty::Value<bool> m_showFile; //!< Show files elements
public:
/**
* @brief Set the status of the displaying files or Not.
* @param[in] _state New state to apply on display the 'file'.
*/
void setShowFiles(bool _state) {
m_showFile.set(_state);
};
/**
* @brief Get the status of the displaying files or Not.
* @return The status on displaying the 'file'.
*/
bool getShowFiles() const {
return m_showFile;
};
protected:
eproperty::Value<bool> m_showFolder; //!< Display the folders elements
public:
/**
* @brief Set the status of the displaying fodlers or Not.
* @param[in] _state New state to apply on display the 'folder'.
*/
void setShowFolder(bool _state) {
m_showFolder.set(_state);
};
/**
* @brief Get the status of the displaying fodlers or Not.
* @return The status on displaying the 'folder'.
*/
bool getShowFolder() const {
return m_showFile;
};
protected:
eproperty::Value<bool> m_showHidden; //!< Display hidden elements
public:
/**
* @brief Set the status of the displaying hidden files or folder or Not.
* @param[in] _state New state to apply on display the hidden element.
*/
void setShowHidden(bool _state) {
m_showHidden.set(_state);
};
/**
* @brief Get the status of the displaying hidden files or folder or Not.
* @return The status on displaying the hidden element.
*/
bool getShowHidden() const {
return m_showFile;
};
protected:
eproperty::Value<bool> m_showTemporaryFile; //!< show the temporary files elements (XXX~, XXX.bck, XXX.pyc ...)
public:
/**
* @brief Set the status of the displaying temporary file (xxx~, xxx.bck, xxx.pyc) or Not.
* @param[in] _state New state to apply on display temporary files.
*/
void setShowTemporaryFiles(bool _state) {
m_showTemporaryFile.set(_state);
};
/**
* @brief Get the status of the displaying temporary file (xxx~, xxx.bck, xxx.pyc) or Not.
* @return The status on displaying temporary files.
*/
bool getShowTemporaryFiles() const {
return m_showFile;
};
public: // glocal derived functions public: // glocal derived functions
virtual void onPropertyChangeValue(const eproperty::Ref& _paramPointer); virtual void onPropertyChangeValue(const eproperty::Ref& _paramPointer);
}; };

4
ewol/widget/Manager.cpp
View File

@ -91,7 +91,7 @@ void ewol::widget::Manager::focusKeep(const std::shared_ptr<ewol::Widget>& _newW
focusWidgetCurrent->rmFocus(); focusWidgetCurrent->rmFocus();
focusWidgetCurrent.reset(); focusWidgetCurrent.reset();
} }
if (_newWidget->canHaveFocus() == false) { if (_newWidget->propertyCanFocus.get() == false) {
EWOL_DEBUG("Widget can not have focus, id=" << _newWidget->getId() ); EWOL_DEBUG("Widget can not have focus, id=" << _newWidget->getId() );
return; return;
} }
@ -104,7 +104,7 @@ void ewol::widget::Manager::focusKeep(const std::shared_ptr<ewol::Widget>& _newW
void ewol::widget::Manager::focusSetDefault(const std::shared_ptr<ewol::Widget>& _newWidget) { void ewol::widget::Manager::focusSetDefault(const std::shared_ptr<ewol::Widget>& _newWidget) {
if( _newWidget != nullptr if( _newWidget != nullptr
&& _newWidget->canHaveFocus() == false) { && _newWidget->propertyCanFocus.get() == false) {
EWOL_VERBOSE("Widget can not have focus, id=" << _newWidget->getId() ); EWOL_VERBOSE("Widget can not have focus, id=" << _newWidget->getId() );
return; return;
} }

12
ewol/widget/Menu.cpp
View File

@ -180,8 +180,8 @@ void ewol::widget::Menu::onButtonPressed(std::weak_ptr<ewol::widget::Button> _bu
std::shared_ptr<ewol::widget::Button> myButton; std::shared_ptr<ewol::widget::Button> myButton;
mySizer = ewol::widget::Sizer::create(widget::Sizer::modeVert); mySizer = ewol::widget::Sizer::create(widget::Sizer::modeVert);
if (mySizer != nullptr) { if (mySizer != nullptr) {
mySizer->lockExpand(vec2(true,true)); mySizer->propertyLockExpand.set(vec2(true,true));
mySizer->setFill(vec2(true,true)); mySizer->propertyFill.set(vec2(true,true));
// set it in the pop-up-system: // set it in the pop-up-system:
tmpContext->setSubWidget(mySizer); tmpContext->setSubWidget(mySizer);
bool menuHaveImage = false; bool menuHaveImage = false;
@ -203,8 +203,8 @@ void ewol::widget::Menu::onButtonPressed(std::weak_ptr<ewol::widget::Button> _bu
EWOL_ERROR("Allocation Error"); EWOL_ERROR("Allocation Error");
continue; continue;
} }
myButton->setExpand(bvec2(true,true)); myButton->propertyExpand.set(bvec2(true,true));
myButton->setFill(bvec2(true,true)); myButton->propertyFill.set(bvec2(true,true));
// set callback // set callback
myButton->signalPressed.bind(shared_from_this(), &ewol::widget::Menu::onButtonPressed, std::weak_ptr<ewol::widget::Button>(myButton)); myButton->signalPressed.bind(shared_from_this(), &ewol::widget::Menu::onButtonPressed, std::weak_ptr<ewol::widget::Button>(myButton));
// add it in the widget list // add it in the widget list
@ -232,8 +232,8 @@ void ewol::widget::Menu::onButtonPressed(std::weak_ptr<ewol::widget::Button> _bu
} else { } else {
std::shared_ptr<ewol::widget::Label> tmpLabel = widget::Label::create(std::string("<left>") + it2->m_label + "</left>\n"); std::shared_ptr<ewol::widget::Label> tmpLabel = widget::Label::create(std::string("<left>") + it2->m_label + "</left>\n");
if (tmpLabel != nullptr) { if (tmpLabel != nullptr) {
tmpLabel->setExpand(bvec2(true,false)); tmpLabel->propertyExpand.set(bvec2(true,false));
tmpLabel->setFill(bvec2(true,true)); tmpLabel->propertyFill.set(bvec2(true,true));
myButton->setSubWidget(tmpLabel); myButton->setSubWidget(tmpLabel);
} }
} }

127
ewol/widget/PopUp.cpp
View File

@ -18,9 +18,9 @@
static const char* annimationIncrease = "increase"; static const char* annimationIncrease = "increase";
ewol::widget::PopUp::PopUp() : ewol::widget::PopUp::PopUp() :
m_shaper(*this, "shaper", "The shaper properties"), propertyShape(*this, "shaper", "", "The shaper properties"),
m_lockExpand(*this, "lock", bvec2(true,true), "Lock expand contamination"), propertyLockExpand(*this, "lock", bvec2(true,true), "Lock expand contamination"),
m_closeOutEvent(*this, "out-click-remove", false, "Remove the widget if the use click outside") { propertyCloseOutEvent(*this, "out-click-remove", false, "Remove the widget if the use click outside") {
addObjectType("ewol::widget::PopUp"); addObjectType("ewol::widget::PopUp");
// Add annimations : // Add annimations :
addAnnimationType(ewol::Widget::annimationModeEnableAdd, annimationIncrease); addAnnimationType(ewol::Widget::annimationModeEnableAdd, annimationIncrease);
@ -28,37 +28,31 @@ ewol::widget::PopUp::PopUp() :
void ewol::widget::PopUp::init(const std::string& _shaperName) { void ewol::widget::PopUp::init(const std::string& _shaperName) {
ewol::widget::Container::init(); ewol::widget::Container::init();
m_userFill.set(bvec2(false,false)); propertyFill.set(bvec2(false,false));
m_shaper.setString(_shaperName); propertyShape.set(_shaperName);
setMinSize(gale::Dimension(vec2(80,80),gale::Dimension::Pourcent)); propertyMinSize.set(gale::Dimension(vec2(80,80),gale::Dimension::Pourcent));
m_userExpand.set(bvec2(false, false)); propertyExpand.set(bvec2(false, false));
} }
ewol::widget::PopUp::~PopUp() { ewol::widget::PopUp::~PopUp() {
} }
void ewol::widget::PopUp::setShaperName(const std::string& _shaperName) {
m_shaper.setString(_shaperName);
markToRedraw();
}
void ewol::widget::PopUp::onChangeSize() { void ewol::widget::PopUp::onChangeSize() {
markToRedraw(); markToRedraw();
if (nullptr == m_subWidget) { if (m_subWidget == nullptr) {
return; return;
} }
ewol::Padding padding = m_shaper->getPadding(); ewol::Padding padding = m_shaper.getPadding();
vec2 subWidgetSize = m_subWidget->getCalculateMinSize(); vec2 subWidgetSize = m_subWidget->getCalculateMinSize();
if (true == m_subWidget->canExpand().x()) { if (true == m_subWidget->canExpand().x()) {
if (m_lockExpand->x() == true) { if (propertyLockExpand->x() == true) {
subWidgetSize.setX(m_minSize.x()); subWidgetSize.setX(m_minSize.x());
} else { } else {
subWidgetSize.setX(m_size.x()-padding.xLeft()); subWidgetSize.setX(m_size.x()-padding.xLeft());
} }
} }
if (true == m_subWidget->canExpand().y()) { if (true == m_subWidget->canExpand().y()) {
if (m_lockExpand->y() == true) { if (propertyLockExpand->y() == true) {
subWidgetSize.setY(m_minSize.y()); subWidgetSize.setY(m_minSize.y());
} else { } else {
subWidgetSize.setY(m_size.y()-padding.yButtom()); subWidgetSize.setY(m_size.y()-padding.yButtom());
@ -79,58 +73,58 @@ void ewol::widget::PopUp::onChangeSize() {
} }
void ewol::widget::PopUp::systemDraw(const ewol::DrawProperty& _displayProp) { void ewol::widget::PopUp::systemDraw(const ewol::DrawProperty& _displayProp) {
if (true == m_hide){ if (propertyHide == true){
// widget is hidden ... // widget is hidden ...
return; return;
} }
ewol::Widget::systemDraw(_displayProp); ewol::Widget::systemDraw(_displayProp);
if (nullptr!=m_subWidget) { if (m_subWidget == nullptr) {
if( m_shaper->getNextDisplayedStatus() == -1 return;
&& m_shaper->getTransitionStatus() >= 1.0) { }
ewol::DrawProperty prop = _displayProp; if( m_shaper.getNextDisplayedStatus() == -1
prop.limit(m_origin, m_size); && m_shaper.getTransitionStatus() >= 1.0) {
m_subWidget->systemDraw(prop); ewol::DrawProperty prop = _displayProp;
} prop.limit(m_origin, m_size);
m_subWidget->systemDraw(prop);
} }
} }
void ewol::widget::PopUp::onDraw() { void ewol::widget::PopUp::onDraw() {
m_shaper->draw(); m_shaper.draw();
} }
void ewol::widget::PopUp::onRegenerateDisplay() { void ewol::widget::PopUp::onRegenerateDisplay() {
if (true == needRedraw()) { if (needRedraw() == true) {
m_shaper->clear(); m_shaper.clear();
ewol::Padding padding = m_shaper->getPadding(); ewol::Padding padding = m_shaper.getPadding();
vec2 tmpSize(0,0); vec2 tmpSize(0,0);
bvec2 expand = canExpand(); bvec2 expand = canExpand();
bvec2 fill = canFill(); bvec2 fill = canFill();
if (fill.x()) { if (fill.x() == true) {
tmpSize.setX(m_size.x()-padding.x()); tmpSize.setX(m_size.x()-padding.x());
} }
if (fill.y()) { if (fill.y() == true) {
tmpSize.setY(m_size.y()-padding.y()); tmpSize.setY(m_size.y()-padding.y());
} }
if (nullptr != m_subWidget) { if (m_subWidget != nullptr) {
vec2 tmpSize = m_subWidget->getSize(); vec2 tmpSize = m_subWidget->getSize();
} }
tmpSize.setMax(m_minSize); tmpSize.setMax(m_minSize);
vec2 tmpOrigin = (m_size-tmpSize)/2.0f; vec2 tmpOrigin = (m_size-tmpSize)/2.0f;
m_shaper.setShape(vec2(0,0),
m_shaper->setShape(vec2(0,0), vec2ClipInt32(m_size),
vec2ClipInt32(m_size), vec2ClipInt32(tmpOrigin-vec2(padding.xLeft(), padding.yButtom())),
vec2ClipInt32(tmpOrigin-vec2(padding.xLeft(), padding.yButtom())), vec2ClipInt32(tmpSize + vec2(padding.x(), padding.y())));
vec2ClipInt32(tmpSize + vec2(padding.x(), padding.y())));
} }
// SUBwIDGET GENERATION ... // SUBwIDGET GENERATION ...
if (nullptr != m_subWidget) { if (m_subWidget != nullptr) {
m_subWidget->onRegenerateDisplay(); m_subWidget->onRegenerateDisplay();
} }
} }
std::shared_ptr<ewol::Widget> ewol::widget::PopUp::getWidgetAtPos(const vec2& _pos) { std::shared_ptr<ewol::Widget> ewol::widget::PopUp::getWidgetAtPos(const vec2& _pos) {
std::shared_ptr<ewol::Widget> val = ewol::widget::Container::getWidgetAtPos(_pos); std::shared_ptr<ewol::Widget> val = ewol::widget::Container::getWidgetAtPos(_pos);
if (nullptr != val) { if (val != nullptr) {
return val; return val;
} }
return std::dynamic_pointer_cast<ewol::Widget>(shared_from_this()); return std::dynamic_pointer_cast<ewol::Widget>(shared_from_this());
@ -138,46 +132,49 @@ std::shared_ptr<ewol::Widget> ewol::widget::PopUp::getWidgetAtPos(const vec2& _p
void ewol::widget::PopUp::onPropertyChangeValue(const eproperty::Ref& _paramPointer) { void ewol::widget::PopUp::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::widget::Container::onPropertyChangeValue(_paramPointer); ewol::widget::Container::onPropertyChangeValue(_paramPointer);
if (_paramPointer == m_shaper) { if (_paramPointer == propertyShape) {
m_shaper.setSource(propertyShape);
markToRedraw(); markToRedraw();
requestUpdateSize(); requestUpdateSize();
} else if (_paramPointer == m_lockExpand) { } else if (_paramPointer == propertyLockExpand) {
markToRedraw(); markToRedraw();
requestUpdateSize(); requestUpdateSize();
} else if (_paramPointer == m_closeOutEvent) { } else if (_paramPointer == propertyCloseOutEvent) {
// nothing to do ... // nothing to do ...
} }
} }
bool ewol::widget::PopUp::onEventInput(const ewol::event::Input& _event) { bool ewol::widget::PopUp::onEventInput(const ewol::event::Input& _event) {
if (0 != _event.getId()) { if (_event.getId() == 0) {
if (true == m_closeOutEvent) { return false;
ewol::Padding padding = m_shaper->getPadding(); }
vec2 tmpSize(0,0); if (propertyCloseOutEvent == true) {
if (nullptr != m_subWidget) { return false;
vec2 tmpSize = m_subWidget->getSize(); }
} ewol::Padding padding = m_shaper.getPadding();
tmpSize.setMax(m_minSize); vec2 tmpSize(0,0);
vec2 tmpOrigin = (m_size-tmpSize)/2.0f; if (m_subWidget != nullptr) {
vec2 tmpSize = m_subWidget->getSize();
}
tmpSize.setMax(m_minSize);
vec2 tmpOrigin = (m_size-tmpSize)/2.0f;
tmpOrigin -= vec2(padding.xLeft(), padding.yButtom()); tmpOrigin -= vec2(padding.xLeft(), padding.yButtom());
tmpSize += vec2(padding.x(), padding.y()); tmpSize += vec2(padding.x(), padding.y());
vec2 pos = relativePosition(_event.getPos()); vec2 pos = relativePosition(_event.getPos());
if( pos.x() < tmpOrigin.x() if( pos.x() < tmpOrigin.x()
|| pos.y() < tmpOrigin.y() || pos.y() < tmpOrigin.y()
|| pos.x() > tmpOrigin.x()+tmpSize.x() || pos.x() > tmpOrigin.x()+tmpSize.x()
|| pos.y() > tmpOrigin.y()+tmpSize.y() ) { || pos.y() > tmpOrigin.y()+tmpSize.y() ) {
autoDestroy(); autoDestroy();
return true; return true;
}
}
} }
return false; return false;
} }
bool ewol::widget::PopUp::onStartAnnimation(enum ewol::Widget::annimationMode _mode) { bool ewol::widget::PopUp::onStartAnnimation(enum ewol::Widget::annimationMode _mode) {
if (_mode==0) { if (_mode == 0) {
/* /*
if (m_annimationTypeStart.get() != annimationIncrease) { if (m_annimationTypeStart.get() != annimationIncrease) {
return false; return false;
@ -191,7 +188,7 @@ bool ewol::widget::PopUp::onStartAnnimation(enum ewol::Widget::annimationMode _m
*/ */
} }
return false; return false;
if (true == m_shaper->changeStatusIn(1) ) { if (m_shaper.changeStatusIn(1) == true) {
periodicCallEnable(); periodicCallEnable();
return true; return true;
} }
@ -203,7 +200,7 @@ void ewol::widget::PopUp::onStopAnnimation() {
} }
void ewol::widget::PopUp::periodicCall(const ewol::event::Time& _event) { void ewol::widget::PopUp::periodicCall(const ewol::event::Time& _event) {
if (false == m_shaper->periodicCall(_event) ) { if (m_shaper.periodicCall(_event) == false) {
stopAnnimation(); stopAnnimation();
} }
markToRedraw(); markToRedraw();

38
ewol/widget/PopUp.h
View File

@ -21,8 +21,10 @@ namespace ewol {
* @ingroup ewolWidgetGroup * @ingroup ewolWidgetGroup
*/ */
class PopUp : public ewol::widget::Container { class PopUp : public ewol::widget::Container {
protected: public: // properties
eproperty::Value<ewol::compositing::Shaper> m_shaper; //!< Compositing theme. eproperty::Value<std::string> propertyShape; //!< Compositing theme.
eproperty::Value<bvec2> propertyLockExpand; //!< Lock the expend of the sub widget to this one == > this permit to limit bigger subWidget
eproperty::Value<bool> propertyCloseOutEvent; //!< ratio progression of a sliding
protected: protected:
/** /**
* @brief Constructor * @brief Constructor
@ -36,38 +38,8 @@ namespace ewol {
* @brief Destructor * @brief Destructor
*/ */
virtual ~PopUp(); virtual ~PopUp();
/**
* @brief set the shaper name (use the contructer one this permit to not noad unused shaper)
* @param[in] _shaperName The new shaper filename
*/
void setShaperName(const std::string& _shaperName);
protected: protected:
eproperty::Value<bvec2> m_lockExpand; //!< Lock the expend of the sub widget to this one == > this permit to limit bigger subWidget ewol::compositing::Shaper m_shaper; //!< Compositing theme.
public:
/**
* @brief Limit the expend properties to the current widget (no contamination)
* @param[in] _lockExpend Lock mode of the expend properties
*/
void lockExpand(const bvec2& _lockExpand) {
m_lockExpand.set(_lockExpand);
}
private:
eproperty::Value<bool> m_closeOutEvent; //!< ratio progression of a sliding
public:
/**
* @brief Request the Auto-remove when the event input is set outside the widget
* @param[in] _state New status
*/
void setRemoveOnExternClick(bool _state) {
m_closeOutEvent.set(_state);
};
/**
* @brief get the status of the request the Auto-remove when the event input is set outside the widget.
* @return the status of the removing
*/
bool getRemoveOnExternClick() const {
return m_closeOutEvent;
};
protected: // Derived function protected: // Derived function
virtual void onDraw(); virtual void onDraw();
virtual void onPropertyChangeValue(const eproperty::Ref& _paramPointer); virtual void onPropertyChangeValue(const eproperty::Ref& _paramPointer);

66
ewol/widget/ProgressBar.cpp
View File

@ -17,16 +17,16 @@
const int32_t dotRadius = 6; const int32_t dotRadius = 6;
ewol::widget::ProgressBar::ProgressBar() : ewol::widget::ProgressBar::ProgressBar() :
m_value(*this, "value", 0.0f, "Value of the progress bar"), propertyValue(*this, "value", 0.0f, 0.0f, 1.0f, "Value of the progress bar"),
m_textColorFg(*this, "color-bg", etk::color::black, "Background color"), propertyTextColorFg(*this, "color-bg", etk::color::black, "Background color"),
m_textColorBgOn(*this, "color-on", etk::Color<>(0x00, 0xFF, 0x00, 0xFF), "Color of the true value"), propertyTextColorBgOn(*this, "color-on", etk::Color<>(0x00, 0xFF, 0x00, 0xFF), "Color of the true value"),
m_textColorBgOff(*this, "color-off", etk::color::none, "Color of the false value") { PropertyTextColorBgOff(*this, "color-off", etk::color::none, "Color of the false value") {
addObjectType("ewol::widget::ProgressBar"); addObjectType("ewol::widget::ProgressBar");
setCanHaveFocus(true);
} }
void ewol::widget::ProgressBar::init() { void ewol::widget::ProgressBar::init() {
ewol::Widget::init(); ewol::Widget::init();
propertyCanFocus.set(true);
} }
ewol::widget::ProgressBar::~ProgressBar() { ewol::widget::ProgressBar::~ProgressBar() {
@ -34,54 +34,50 @@ ewol::widget::ProgressBar::~ProgressBar() {
} }
void ewol::widget::ProgressBar::calculateMinMaxSize() { void ewol::widget::ProgressBar::calculateMinMaxSize() {
vec2 tmpMin = m_userMinSize->getPixel(); vec2 tmpMin = propertyMinSize->getPixel();
m_minSize.setValue( std::max(tmpMin.x(), 40.0f), m_minSize.setValue( std::max(tmpMin.x(), 40.0f),
std::max(tmpMin.y(), dotRadius*2.0f) ); std::max(tmpMin.y(), dotRadius*2.0f) );
markToRedraw(); markToRedraw();
} }
void ewol::widget::ProgressBar::setValue(float _val) {
m_value = std::avg(0.0f, _val, 1.0f);
markToRedraw();
}
void ewol::widget::ProgressBar::onDraw() { void ewol::widget::ProgressBar::onDraw() {
m_draw.draw(); m_draw.draw();
} }
void ewol::widget::ProgressBar::onRegenerateDisplay() { void ewol::widget::ProgressBar::onRegenerateDisplay() {
if (true == needRedraw()) { if (needRedraw() == false) {
// clean the object list ... return;
m_draw.clear();
m_draw.setColor(m_textColorFg);
int32_t tmpSizeX = m_size.x() - 10;
int32_t tmpSizeY = m_size.y() - 10;
int32_t tmpOriginX = 5;
int32_t tmpOriginY = 5;
m_draw.setColor(m_textColorBgOn);
m_draw.setPos(vec3(tmpOriginX, tmpOriginY, 0) );
m_draw.rectangleWidth(vec3(tmpSizeX*m_value, tmpSizeY, 0) );
m_draw.setColor(m_textColorBgOff);
m_draw.setPos(vec3(tmpOriginX+tmpSizeX*m_value, tmpOriginY, 0) );
m_draw.rectangleWidth(vec3(tmpSizeX*(1.0-m_value), tmpSizeY, 0) );
// TODO : Create a better progress Bar ...
//m_draw.setColor(m_textColorFg);
//m_draw.rectangleBorder( tmpOriginX, tmpOriginY, tmpSizeX, tmpSizeY, 1);
} }
// clean the object list ...
m_draw.clear();
m_draw.setColor(propertyTextColorFg);
int32_t tmpSizeX = m_size.x() - 10;
int32_t tmpSizeY = m_size.y() - 10;
int32_t tmpOriginX = 5;
int32_t tmpOriginY = 5;
m_draw.setColor(propertyTextColorBgOn);
m_draw.setPos(vec3(tmpOriginX, tmpOriginY, 0) );
m_draw.rectangleWidth(vec3(tmpSizeX*propertyValue, tmpSizeY, 0) );
m_draw.setColor(PropertyTextColorBgOff);
m_draw.setPos(vec3(tmpOriginX+tmpSizeX*propertyValue, tmpOriginY, 0) );
m_draw.rectangleWidth(vec3(tmpSizeX*(1.0-propertyValue), tmpSizeY, 0) );
// TODO : Create a better progress Bar ...
//m_draw.setColor(propertyTextColorFg);
//m_draw.rectangleBorder( tmpOriginX, tmpOriginY, tmpSizeX, tmpSizeY, 1);
} }
void ewol::widget::ProgressBar::onPropertyChangeValue(const eproperty::Ref& _paramPointer) { void ewol::widget::ProgressBar::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::Widget::onPropertyChangeValue(_paramPointer); ewol::Widget::onPropertyChangeValue(_paramPointer);
if (_paramPointer == m_value) { if (_paramPointer == propertyValue) {
markToRedraw(); markToRedraw();
} else if (_paramPointer == m_textColorFg) { } else if (_paramPointer == propertyTextColorFg) {
markToRedraw(); markToRedraw();
} else if (_paramPointer == m_textColorBgOn) { } else if (_paramPointer == propertyTextColorBgOn) {
markToRedraw(); markToRedraw();
} else if (_paramPointer == m_textColorBgOff) { } else if (_paramPointer == PropertyTextColorBgOff) {
markToRedraw(); markToRedraw();
} }
} }

19
ewol/widget/ProgressBar.h
View File

@ -20,26 +20,19 @@ namespace ewol {
* @ingroup ewolWidgetGroup * @ingroup ewolWidgetGroup
*/ */
class ProgressBar : public ewol::Widget { class ProgressBar : public ewol::Widget {
private: public: // properties
ewol::compositing::Drawing m_draw; // basic drawing element eproperty::Range<float> propertyValue; //!< % used
eproperty::Value<etk::Color<>> propertyTextColorFg; //!< forder bar color
eproperty::Value<etk::Color<>> propertyTextColorBgOn; //!< bar color enable
eproperty::Value<etk::Color<>> PropertyTextColorBgOff; //!< bar color disable
protected: protected:
ProgressBar(); ProgressBar();
void init(); void init();
public: public:
DECLARE_WIDGET_FACTORY(ProgressBar, "ProgressBar"); DECLARE_WIDGET_FACTORY(ProgressBar, "ProgressBar");
virtual ~ProgressBar(); virtual ~ProgressBar();
void setValue(float _val);
float getValue() const {
return m_value;
};
void setColor(etk::Color<> _newColor) {
m_textColorFg = _newColor;
};
private: private:
eproperty::Value<float> m_value; //!< % used ewol::compositing::Drawing m_draw; // basic drawing element
eproperty::Value<etk::Color<>> m_textColorFg; //!< forder bar color
eproperty::Value<etk::Color<>> m_textColorBgOn; //!< bar color enable
eproperty::Value<etk::Color<>> m_textColorBgOff; //!< bar color disable
protected: // Derived function protected: // Derived function
virtual void onDraw(); virtual void onDraw();
virtual void onPropertyChangeValue(const eproperty::Ref& _paramPointer); virtual void onPropertyChangeValue(const eproperty::Ref& _paramPointer);

75
ewol/widget/Scroll.cpp
View File

@ -15,7 +15,9 @@
#define __class__ "Scroll" #define __class__ "Scroll"
ewol::widget::Scroll::Scroll() : ewol::widget::Scroll::Scroll() :
m_limit(*this, "limit", vec2(0.15,0.5), vec2(0.0,0.0), vec2(1.0,1.0), "Limit the scroll maximum position [0..1]% represent the free space in the scoll when arrive at the end"), propertyLimit(*this, "limit", vec2(0.15,0.5), vec2(0.0,0.0), vec2(1.0,1.0), "Limit the scroll maximum position [0..1]% represent the free space in the scoll when arrive at the end"),
propertyShapeVert(*this, "shape-vert", "", "shape for the vertical display"),
propertyShapeHori(*this, "shape-hori", "", "shape for the horizonal display"),
m_pixelScrolling(20), m_pixelScrolling(20),
m_highSpeedStartPos(0,0), m_highSpeedStartPos(0,0),
m_highSpeedMode(speedModeDisable), m_highSpeedMode(speedModeDisable),
@ -26,8 +28,8 @@ ewol::widget::Scroll::Scroll() :
void ewol::widget::Scroll::init(const std::string& _shaperName) { void ewol::widget::Scroll::init(const std::string& _shaperName) {
ewol::widget::Container::init(); ewol::widget::Container::init();
m_shaperH.setSource(_shaperName); propertyShapeVert.set(_shaperName);
m_shaperV.setSource(_shaperName); propertyShapeHori.set(_shaperName);
} }
@ -35,27 +37,22 @@ ewol::widget::Scroll::~Scroll() {
} }
void ewol::widget::Scroll::setLimit(const vec2& _limit) {
m_limit.set(_limit);
markToRedraw();
}
#define SCROLL_BAR_SPACE (15) #define SCROLL_BAR_SPACE (15)
void ewol::widget::Scroll::calculateMinMaxSize() { void ewol::widget::Scroll::calculateMinMaxSize() {
// call main class !! and not containter class ... // call main class !! and not containter class ...
ewol::Widget::calculateMinMaxSize(); ewol::Widget::calculateMinMaxSize();
// call sub classes // call sub classes
if (nullptr!=m_subWidget) { if (m_subWidget != nullptr) {
m_subWidget->calculateMinMaxSize(); m_subWidget->calculateMinMaxSize();
} }
} }
void ewol::widget::Scroll::systemDraw(const ewol::DrawProperty& _displayProp) { void ewol::widget::Scroll::systemDraw(const ewol::DrawProperty& _displayProp) {
if (m_hide == true) { if (propertyHide == true) {
return; return;
} }
if (nullptr!=m_subWidget) { if (m_subWidget != nullptr) {
ewol::DrawProperty prop = _displayProp; ewol::DrawProperty prop = _displayProp;
prop.limit(m_origin, m_size); prop.limit(m_origin, m_size);
m_subWidget->systemDraw(prop); m_subWidget->systemDraw(prop);
@ -89,7 +86,7 @@ void ewol::widget::Scroll::onRegenerateDisplay() {
|| scrollOffset.y()!=0) { || scrollOffset.y()!=0) {
float lenScrollBar = m_size.y()*m_size.y() / scrollSize.y(); float lenScrollBar = m_size.y()*m_size.y() / scrollSize.y();
lenScrollBar = std::avg(10.0f, lenScrollBar, m_size.y()); lenScrollBar = std::avg(10.0f, lenScrollBar, m_size.y());
float originScrollBar = scrollOffset.y() / (scrollSize.y()-m_size.y()*m_limit->y()); float originScrollBar = scrollOffset.y() / (scrollSize.y()-m_size.y()*propertyLimit->y());
originScrollBar = std::avg(0.0f, originScrollBar, 1.0f); originScrollBar = std::avg(0.0f, originScrollBar, 1.0f);
originScrollBar *= (m_size.y()-lenScrollBar); originScrollBar *= (m_size.y()-lenScrollBar);
m_shaperV.setShape(vec2(m_size.x() - paddingVert.x(), 0), m_shaperV.setShape(vec2(m_size.x() - paddingVert.x(), 0),
@ -101,7 +98,7 @@ void ewol::widget::Scroll::onRegenerateDisplay() {
|| scrollOffset.x()!=0) { || scrollOffset.x()!=0) {
float lenScrollBar = (m_size.x()-paddingHori.xLeft())*(m_size.x()-paddingVert.x()) / scrollSize.x(); float lenScrollBar = (m_size.x()-paddingHori.xLeft())*(m_size.x()-paddingVert.x()) / scrollSize.x();
lenScrollBar = std::avg(10.0f, lenScrollBar, (m_size.x()-paddingVert.x())); lenScrollBar = std::avg(10.0f, lenScrollBar, (m_size.x()-paddingVert.x()));
float originScrollBar = scrollOffset.x() / (scrollSize.x()-m_size.x()*m_limit->x()); float originScrollBar = scrollOffset.x() / (scrollSize.x()-m_size.x()*propertyLimit->x());
originScrollBar = std::avg(0.0f, originScrollBar, 1.0f); originScrollBar = std::avg(0.0f, originScrollBar, 1.0f);
originScrollBar *= (m_size.x()-paddingHori.xRight()-lenScrollBar); originScrollBar *= (m_size.x()-paddingHori.xRight()-lenScrollBar);
m_shaperH.setShape(vec2(0, 0), m_shaperH.setShape(vec2(0, 0),
@ -139,7 +136,7 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
m_highSpeedButton = 1; m_highSpeedButton = 1;
// force direct scrolling in this case // force direct scrolling in this case
scrollOffset.setY((int32_t)(scrollSize.y() * (relativePos.y()-SCROLL_BAR_SPACE) / (m_size.y()-SCROLL_BAR_SPACE*2))); 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()*m_limit->y()))); scrollOffset.setY(std::avg(0.0f, scrollOffset.y(), (scrollSize.y() - m_size.y()*propertyLimit->y())));
markToRedraw(); markToRedraw();
if (nullptr!=m_subWidget) { if (nullptr!=m_subWidget) {
m_subWidget->setOffset(scrollOffset); m_subWidget->setOffset(scrollOffset);
@ -156,7 +153,7 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
m_highSpeedButton = 1; m_highSpeedButton = 1;
// force direct scrolling in this case // force direct scrolling in this case
scrollOffset.setX((int32_t)(scrollSize.x() * (relativePos.x()-SCROLL_BAR_SPACE) / (m_size.x()-SCROLL_BAR_SPACE*2))); 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()*m_limit->x()))); scrollOffset.setY(std::avg(0.0f, scrollOffset.x(), (scrollSize.x() - m_size.x()*propertyLimit->x())));
markToRedraw(); markToRedraw();
if (nullptr!=m_subWidget) { if (nullptr!=m_subWidget) {
m_subWidget->setOffset(scrollOffset); m_subWidget->setOffset(scrollOffset);
@ -169,7 +166,7 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
&& _event.getStatus() == gale::key::status_up) { && _event.getStatus() == gale::key::status_up) {
if(m_size.y() < scrollSize.y()) { if(m_size.y() < scrollSize.y()) {
scrollOffset.setY(scrollOffset.y()-m_pixelScrolling); scrollOffset.setY(scrollOffset.y()-m_pixelScrolling);
scrollOffset.setY(std::avg(0.0f, scrollOffset.y(), (scrollSize.y() - m_size.y()*m_limit->y()))); scrollOffset.setY(std::avg(0.0f, scrollOffset.y(), (scrollSize.y() - m_size.y()*propertyLimit->y())));
markToRedraw(); markToRedraw();
if (nullptr!=m_subWidget) { if (nullptr!=m_subWidget) {
m_subWidget->setOffset(scrollOffset); m_subWidget->setOffset(scrollOffset);
@ -180,7 +177,7 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
&& _event.getStatus() == gale::key::status_up) { && _event.getStatus() == gale::key::status_up) {
if(m_size.y() < scrollSize.y()) { if(m_size.y() < scrollSize.y()) {
scrollOffset.setY(scrollOffset.y()+m_pixelScrolling); scrollOffset.setY(scrollOffset.y()+m_pixelScrolling);
scrollOffset.setY(std::avg(0.0f, scrollOffset.y(), (scrollSize.y() - m_size.y()*m_limit->y()))); scrollOffset.setY(std::avg(0.0f, scrollOffset.y(), (scrollSize.y() - m_size.y()*propertyLimit->y())));
markToRedraw(); markToRedraw();
if (nullptr!=m_subWidget) { if (nullptr!=m_subWidget) {
m_subWidget->setOffset(scrollOffset); m_subWidget->setOffset(scrollOffset);
@ -227,8 +224,8 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
} else if( m_highSpeedMode == speedModeInit } else if( m_highSpeedMode == speedModeInit
&& _event.getStatus() == gale::key::status_move) { && _event.getStatus() == gale::key::status_move) {
// wait that the cursor move more than 10 px to enable it : // wait that the cursor move more than 10 px to enable it :
if( abs(relativePos.x() - m_highSpeedStartPos.x()) > 10 if( std::abs(relativePos.x() - m_highSpeedStartPos.x()) > 10
|| abs(relativePos.y() - m_highSpeedStartPos.y()) > 10 ) { || std::abs(relativePos.y() - m_highSpeedStartPos.y()) > 10 ) {
// the scrooling can start : // the scrooling can start :
// select the direction : // select the direction :
if (relativePos.x() == m_highSpeedStartPos.x()) { if (relativePos.x() == m_highSpeedStartPos.x()) {
@ -237,7 +234,7 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
m_highSpeedMode = speedModeEnableHorizontal; m_highSpeedMode = speedModeEnableHorizontal;
} else { } else {
float coef = (relativePos.y() - m_highSpeedStartPos.y()) / (relativePos.x() - m_highSpeedStartPos.x()); float coef = (relativePos.y() - m_highSpeedStartPos.y()) / (relativePos.x() - m_highSpeedStartPos.x());
if (abs(coef) <= 1 ) { if (std::abs(coef) <= 1 ) {
m_highSpeedMode = speedModeEnableHorizontal; m_highSpeedMode = speedModeEnableHorizontal;
} else { } else {
m_highSpeedMode = speedModeEnableVertical; m_highSpeedMode = speedModeEnableVertical;
@ -250,8 +247,8 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
} }
markToRedraw(); markToRedraw();
} }
scrollOffset.setY(std::avg(0.0f, scrollOffset.y(), (scrollSize.y() - m_size.y()*m_limit->y()))); scrollOffset.setY(std::avg(0.0f, scrollOffset.y(), (scrollSize.y() - m_size.y()*propertyLimit->y())));
if (nullptr!=m_subWidget) { if (m_subWidget != nullptr) {
m_subWidget->setOffset(scrollOffset); m_subWidget->setOffset(scrollOffset);
} }
return true; return true;
@ -259,9 +256,9 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
if( m_highSpeedMode == speedModeEnableHorizontal if( m_highSpeedMode == speedModeEnableHorizontal
&& _event.getStatus() == gale::key::status_move) { && _event.getStatus() == gale::key::status_move) {
scrollOffset.setX((int32_t)(scrollSize.x() * (relativePos.x()-SCROLL_BAR_SPACE) / (m_size.x()-SCROLL_BAR_SPACE*2))); scrollOffset.setX((int32_t)(scrollSize.x() * (relativePos.x()-SCROLL_BAR_SPACE) / (m_size.x()-SCROLL_BAR_SPACE*2)));
scrollOffset.setX(std::avg(0.0f, scrollOffset.x(), (scrollSize.x() - m_size.x()*m_limit->x() ))); scrollOffset.setX(std::avg(0.0f, scrollOffset.x(), (scrollSize.x() - m_size.x()*propertyLimit->x() )));
markToRedraw(); markToRedraw();
if (nullptr!=m_subWidget) { if (m_subWidget != nullptr) {
m_subWidget->setOffset(scrollOffset); m_subWidget->setOffset(scrollOffset);
} }
return true; return true;
@ -269,9 +266,9 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
if( m_highSpeedMode == speedModeEnableVertical if( m_highSpeedMode == speedModeEnableVertical
&& _event.getStatus() == gale::key::status_move) { && _event.getStatus() == gale::key::status_move) {
scrollOffset.setY((int32_t)(scrollSize.y() * (relativePos.y()-SCROLL_BAR_SPACE) / (m_size.y()-SCROLL_BAR_SPACE*2))); 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()*m_limit->x()))); scrollOffset.setY(std::avg(0.0f, scrollOffset.y(), (scrollSize.y() - m_size.y()*propertyLimit->x())));
markToRedraw(); markToRedraw();
if (nullptr!=m_subWidget) { if (m_subWidget != nullptr) {
m_subWidget->setOffset(scrollOffset); m_subWidget->setOffset(scrollOffset);
} }
return true; return true;
@ -297,8 +294,8 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
} else if ( m_highSpeedMode == speedModeInit } else if ( m_highSpeedMode == speedModeInit
&& gale::key::status_move == _event.getStatus()) { && gale::key::status_move == _event.getStatus()) {
// wait that the cursor move more than 10 px to enable it : // wait that the cursor move more than 10 px to enable it :
if( abs(relativePos.x() - m_highSpeedStartPos.x()) > 10 if( std::abs(relativePos.x() - m_highSpeedStartPos.x()) > 10
|| abs(relativePos.y() - m_highSpeedStartPos.y()) > 10 ) { || std::abs(relativePos.y() - m_highSpeedStartPos.y()) > 10 ) {
// the scrooling can start : // the scrooling can start :
// select the direction : // select the direction :
m_highSpeedMode = speedModeEnableFinger; m_highSpeedMode = speedModeEnableFinger;
@ -311,19 +308,19 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
&& gale::key::status_move == _event.getStatus()) { && gale::key::status_move == _event.getStatus()) {
EWOL_VERBOSE("SCROOL == > INIT scrollOffset=" << scrollOffset.y() << " relativePos=" << relativePos.y() << " m_highSpeedStartPos=" << m_highSpeedStartPos.y()); EWOL_VERBOSE("SCROOL == > INIT scrollOffset=" << scrollOffset.y() << " relativePos=" << relativePos.y() << " m_highSpeedStartPos=" << m_highSpeedStartPos.y());
//scrollOffset.x = (int32_t)(scrollSize.x * x / m_size.x); //scrollOffset.x = (int32_t)(scrollSize.x * x / m_size.x);
if (m_limit->x() != 0.0f) { if (propertyLimit->x() != 0.0f) {
scrollOffset.setX(scrollOffset.x() + (relativePos.x() - m_highSpeedStartPos.x())); scrollOffset.setX(scrollOffset.x() + (relativePos.x() - m_highSpeedStartPos.x()));
scrollOffset.setX(std::avg(0.0f, scrollOffset.x(), (scrollSize.x() - m_size.x()*m_limit->x()))); scrollOffset.setX(std::avg(0.0f, scrollOffset.x(), (scrollSize.x() - m_size.x()*propertyLimit->x())));
} }
if (m_limit->y() != 0.0f) { if (propertyLimit->y() != 0.0f) {
scrollOffset.setY(scrollOffset.y() - (relativePos.y() - m_highSpeedStartPos.y())); scrollOffset.setY(scrollOffset.y() - (relativePos.y() - m_highSpeedStartPos.y()));
scrollOffset.setY(std::avg(0.0f, scrollOffset.y(), (scrollSize.y() - m_size.y()*m_limit->y()))); scrollOffset.setY(std::avg(0.0f, scrollOffset.y(), (scrollSize.y() - m_size.y()*propertyLimit->y())));
} }
// update current position: // update current position:
m_highSpeedStartPos = relativePos; m_highSpeedStartPos = relativePos;
EWOL_VERBOSE("SCROOL == > MOVE " << scrollOffset); EWOL_VERBOSE("SCROOL == > MOVE " << scrollOffset);
markToRedraw(); markToRedraw();
if (nullptr!=m_subWidget) { if (m_subWidget != nullptr) {
m_subWidget->setOffset(scrollOffset); m_subWidget->setOffset(scrollOffset);
} }
return true; return true;
@ -345,15 +342,21 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
std::shared_ptr<ewol::Widget> ewol::widget::Scroll::getWidgetAtPos(const vec2& _pos) { std::shared_ptr<ewol::Widget> ewol::widget::Scroll::getWidgetAtPos(const vec2& _pos) {
std::shared_ptr<ewol::Widget> tmpWidget = ewol::widget::Container::getWidgetAtPos(_pos); std::shared_ptr<ewol::Widget> tmpWidget = ewol::widget::Container::getWidgetAtPos(_pos);
if (nullptr != tmpWidget) { if (tmpWidget != nullptr) {
return tmpWidget; return tmpWidget;
} }
return std::dynamic_pointer_cast<ewol::Widget>(shared_from_this());; return std::dynamic_pointer_cast<ewol::Widget>(shared_from_this());;
} }
void ewol::widget::Scroll::onPropertyChangeValue(const eproperty::Ref& _paramPointer) { void ewol::widget::Scroll::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::widget::Container::onPropertyChangeValue(_paramPointer); ewol::widget::Container::onPropertyChangeValue(_paramPointer);
if (_paramPointer == m_limit) { if (_paramPointer == propertyLimit) {
markToRedraw();
} else if (_paramPointer == propertyShapeVert) {
m_shaperV.setSource(propertyShapeVert);
markToRedraw();
} else if (_paramPointer == propertyShapeHori) {
m_shaperH.setSource(propertyShapeHori);
markToRedraw();
} }
} }

20
ewol/widget/Scroll.h
View File

@ -17,6 +17,10 @@
namespace ewol { namespace ewol {
namespace widget { namespace widget {
class Scroll : public ewol::widget::Container { class Scroll : public ewol::widget::Container {
public: // properties
eproperty::Range<vec2> propertyLimit; //!< Set the limitation of the ratio in the sreen
eproperty::Value<std::string> propertyShapeVert; //!< Vertical shaper name
eproperty::Value<std::string> propertyShapeHori; //!< Horizontal shaper name
public: public:
enum highSpeedMode { enum highSpeedMode {
speedModeDisable, speedModeDisable,
@ -29,8 +33,6 @@ namespace ewol {
private: private:
ewol::compositing::Shaper m_shaperH; //!< Compositing theme Horizontal. ewol::compositing::Shaper m_shaperH; //!< Compositing theme Horizontal.
ewol::compositing::Shaper m_shaperV; //!< Compositing theme Vertical. ewol::compositing::Shaper m_shaperV; //!< Compositing theme Vertical.
protected:
eproperty::Range<vec2> m_limit;
private: private:
float m_pixelScrolling; float m_pixelScrolling;
vec2 m_highSpeedStartPos; vec2 m_highSpeedStartPos;
@ -43,20 +45,6 @@ namespace ewol {
public: public:
DECLARE_WIDGET_FACTORY(Scroll, "Scroll"); DECLARE_WIDGET_FACTORY(Scroll, "Scroll");
virtual ~Scroll(); virtual ~Scroll();
/**
* @brief set the limit of scrolling
* @note This permit to scoll element upper the end of the display
* @param[in] _limit scrolling limit [0..1] (represent a pourcent)
*/
void setLimit(const vec2& _limit);
/**
* @brief get the limit of scrolling
* @return scrolling limit
*/
const vec2& getLimit() const {
return m_limit;
};
public: // Derived function public: // Derived function
void calculateMinMaxSize(); void calculateMinMaxSize();
virtual void onRegenerateDisplay(); virtual void onRegenerateDisplay();

33
ewol/widget/Select.cpp
View File

@ -29,7 +29,7 @@ ewol::widget::Select::Element::Element(int32_t _value, std::string _name, bool _
ewol::widget::Select::Select() : ewol::widget::Select::Select() :
signalValue(*this, "value", "Select value change"), signalValue(*this, "value", "Select value change"),
m_value(*this, "value", -1, "Value of the Select") { propertyValue(*this, "value", -1, "Value of the Select") {
addObjectType("ewol::widget::Select"); addObjectType("ewol::widget::Select");
} }
@ -46,18 +46,18 @@ ewol::widget::Select::~Select() {
void ewol::widget::Select::onPropertyChangeValue(const eproperty::Ref& _paramPointer) { void ewol::widget::Select::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::widget::SpinBase::onPropertyChangeValue(_paramPointer); ewol::widget::SpinBase::onPropertyChangeValue(_paramPointer);
if (_paramPointer == m_value) { if (_paramPointer == propertyValue) {
markToRedraw(); markToRedraw();
if (m_widgetEntry == nullptr) { if (m_widgetEntry == nullptr) {
EWOL_ERROR("Can not acces at entry ..."); EWOL_ERROR("Can not acces at entry ...");
return; return;
} }
for (auto &it : m_listElement) { for (auto &it : m_listElement) {
if (it.m_value == m_value.get()) { if (it.m_value == propertyValue.get()) {
if (it.m_selected == false) { if (it.m_selected == false) {
it.m_selected = true; it.m_selected = true;
m_widgetEntry->setValue(it.m_name); m_widgetEntry->propertyValue.set(it.m_name);
signalValue.emit(m_value.get()); signalValue.emit(propertyValue.get());
} }
} else { } else {
it.m_selected = false; it.m_selected = false;
@ -77,9 +77,9 @@ void ewol::widget::Select::optionSelectDefault() {
} }
} }
if (m_listElement.size() == 0) { if (m_listElement.size() == 0) {
m_widgetEntry->setValue(""); m_widgetEntry->propertyValue.set("");
} }
m_widgetEntry->setValue(m_listElement[0].m_name); m_widgetEntry->propertyValue.set(m_listElement[0].m_name);
} }
void ewol::widget::Select::optionRemove(int32_t _value) { void ewol::widget::Select::optionRemove(int32_t _value) {
@ -134,7 +134,7 @@ bool ewol::widget::Select::loadXML(const std::shared_ptr<const exml::Element>& _
int32_t select = etk::string_to_bool(valIsSelected); int32_t select = etk::string_to_bool(valIsSelected);
optionAdd(id, valText); optionAdd(id, valText);
if (select == true) { if (select == true) {
setValue(id); propertyValue.set(id);
} }
EWOL_WARNING("Add option : id='" << valId << "' select='" << valIsSelected << "' text='" << valText << "'"); EWOL_WARNING("Add option : id='" << valId << "' select='" << valIsSelected << "' text='" << valText << "'");
@ -158,7 +158,7 @@ void ewol::widget::Select::updateGui() {
void ewol::widget::Select::onCallbackLabelPressed(int32_t _value) { void ewol::widget::Select::onCallbackLabelPressed(int32_t _value) {
EWOL_VERBOSE("User select:" << _value); EWOL_VERBOSE("User select:" << _value);
setValue(_value); propertyValue.set(_value);
} }
void ewol::widget::Select::onCallbackOpenMenu() { void ewol::widget::Select::onCallbackOpenMenu() {
@ -176,8 +176,8 @@ void ewol::widget::Select::onCallbackOpenMenu() {
EWOL_ERROR("Allocation Error or sizer"); EWOL_ERROR("Allocation Error or sizer");
return; return;
} }
mySizer->lockExpand(vec2(true,true)); mySizer->propertyLockExpand.set(vec2(true,true));
mySizer->setFill(vec2(true,true)); mySizer->propertyFill.set(vec2(true,true));
// set it in the pop-up-system: // set it in the pop-up-system:
tmpContext->setSubWidget(mySizer); tmpContext->setSubWidget(mySizer);
for (auto &it : m_listElement) { for (auto &it : m_listElement) {
@ -191,8 +191,8 @@ void ewol::widget::Select::onCallbackOpenMenu() {
EWOL_ERROR("Allocation Error"); EWOL_ERROR("Allocation Error");
continue; continue;
} }
myLabel->setExpand(bvec2(true,true)); myLabel->propertyExpand.set(bvec2(true,true));
myLabel->setFill(bvec2(true,true)); myLabel->propertyFill.set(bvec2(true,true));
// set callback // set callback
myLabel->signalPressed.bind(shared_from_this(), &ewol::widget::Select::onCallbackLabelPressed, it.m_value); myLabel->signalPressed.bind(shared_from_this(), &ewol::widget::Select::onCallbackLabelPressed, it.m_value);
myLabel->signalPressed.bind(tmpContext, &ewol::widget::ContextMenu::destroy); myLabel->signalPressed.bind(tmpContext, &ewol::widget::ContextMenu::destroy);
@ -207,10 +207,3 @@ void ewol::widget::Select::onCallbackOpenMenu() {
} }
} }
void ewol::widget::Select::setValue(int32_t _val) {
m_value.set(_val);
}
int32_t ewol::widget::Select::getValue() const {
return m_value.get();
};

27
ewol/widget/Select.h
View File

@ -18,9 +18,10 @@ namespace ewol {
* ==> this permit to generate standard element simple * ==> this permit to generate standard element simple
*/ */
class Select : public ewol::widget::SpinBase { class Select : public ewol::widget::SpinBase {
public: public: // signals
// Event list of properties
esignal::Signal<int32_t> signalValue; esignal::Signal<int32_t> signalValue;
public: // properties
eproperty::Value<int32_t> propertyValue; //!< Current state of the Select.
protected: protected:
/** /**
* @brief Constructor * @brief Constructor
@ -34,13 +35,6 @@ namespace ewol {
* @brief Destructor * @brief Destructor
*/ */
virtual ~Select(); virtual ~Select();
/**
* @brief set the shaper name (use the contructer one this permit to not noad unused shaper)
* @param[in] _shaperName The new shaper filename
*/
void setShaperName(const std::string& _shaperName) {
//m_shaper.setString(_shaperName);
}
protected: protected:
class Element { class Element {
public: public:
@ -56,21 +50,6 @@ namespace ewol {
void optionRemove(int32_t _value); void optionRemove(int32_t _value);
void optionClear(); void optionClear();
void optionAdd(int32_t _value, std::string _name); void optionAdd(int32_t _value, std::string _name);
protected:
eproperty::Value<int32_t> m_value; //!< Current state of the Select.
public:
/**
* @brief set the currentValue of the Select (pressed or not)
* @note Work only in toggle mode
* @param[in] _val New value of the Select
*/
void setValue(int32_t _val);
/**
* @brief get the current Select value.
* @return True : The Select is pressed.
* @return false : The Select is released.
*/
int32_t getValue() const;
protected: protected:
virtual void onPropertyChangeValue(const eproperty::Ref& _paramPointer); virtual void onPropertyChangeValue(const eproperty::Ref& _paramPointer);
virtual bool loadXML(const std::shared_ptr<const exml::Element>& _node); virtual bool loadXML(const std::shared_ptr<const exml::Element>& _node);

70
ewol/widget/Sizer.cpp
View File

@ -14,32 +14,34 @@
#define __class__ "Sizer" #define __class__ "Sizer"
ewol::widget::Sizer::Sizer() : ewol::widget::Sizer::Sizer() :
m_mode(*this, "mode", modeHori, "The display mode"), propertyMode(*this, "mode", modeHori, "The display mode"),
m_borderSize(*this, "border", vec2(0,0), "The sizer border size"), propertyBorderSize(*this, "border", vec2(0,0), "The sizer border size"),
m_animation(animationNone), propertyAnimation(*this, "annimation", animationNone, "sizer annimation"),
m_animationTime(0) { propertyAnimationTime(*this, "annimation-time", 0, "time of the anniation") {
addObjectType("ewol::widget::Sizer"); addObjectType("ewol::widget::Sizer");
m_mode.add(modeHori, "hori"); propertyMode.add(modeHori, "hori");
m_mode.add(modeVert, "vert"); propertyMode.add(modeVert, "vert");
propertyAnimation.add(animationNone, "none");
propertyAnimation.add(animationTop, "top");
propertyAnimation.add(animationbuttom, "buttom");
propertyAnimation.add(animationLeft, "left");
propertyAnimation.add(animationRight, "right");
} }
void ewol::widget::Sizer::init(enum displayMode _mode) { void ewol::widget::Sizer::init(enum displayMode _mode) {
ewol::widget::ContainerN::init(); ewol::widget::ContainerN::init();
m_mode.set(_mode); propertyMode.set(_mode);
} }
ewol::widget::Sizer::~Sizer() { ewol::widget::Sizer::~Sizer() {
// disable annimation to remore "remove" error //EWOL_DEBUG("[" << getId() << "]={" << getObjectType() << "} sizer : destroy (mode=" << (propertyMode == ewol::widget::Sizer::modeVert?"Vert":"Hori") << ")");
m_animation = animationNone;
m_animationTime = 0;
//EWOL_DEBUG("[" << getId() << "]={" << getObjectType() << "} sizer : destroy (mode=" << (m_mode == ewol::widget::Sizer::modeVert?"Vert":"Hori") << ")");
} }
void ewol::widget::Sizer::onChangeSize() { void ewol::widget::Sizer::onChangeSize() {
ewol::Widget::onChangeSize(); ewol::Widget::onChangeSize();
vec2 tmpBorderSize = m_borderSize->getPixel(); vec2 tmpBorderSize = propertyBorderSize->getPixel();
EWOL_VERBOSE("[" << getId() << "] update size : " << m_size << " nbElement : " << m_subWidget.size() << " borderSize=" << tmpBorderSize << " from border=" << m_borderSize); EWOL_VERBOSE("[" << getId() << "] update size : " << m_size << " nbElement : " << m_subWidget.size() << " borderSize=" << tmpBorderSize << " from border=" << propertyBorderSize);
vec2 localWidgetSize = m_size - tmpBorderSize*2.0f; vec2 localWidgetSize = m_size - tmpBorderSize*2.0f;
// -1- calculate min-size and expand requested: // -1- calculate min-size and expand requested:
vec2 minSize(0.0f, 0.0f); vec2 minSize(0.0f, 0.0f);
@ -49,7 +51,7 @@ void ewol::widget::Sizer::onChangeSize() {
continue; continue;
} }
vec2 tmpSize = it->getCalculateMinSize(); vec2 tmpSize = it->getCalculateMinSize();
if (m_mode == ewol::widget::Sizer::modeVert) { if (propertyMode == ewol::widget::Sizer::modeVert) {
minSize = vec2(std::max(minSize.x(), tmpSize.x()), minSize = vec2(std::max(minSize.x(), tmpSize.x()),
minSize.y() + tmpSize.y()); minSize.y() + tmpSize.y());
} else { } else {
@ -63,7 +65,7 @@ void ewol::widget::Sizer::onChangeSize() {
// -2- Calculate the size to add at every elements... // -2- Calculate the size to add at every elements...
float deltaExpandSize = 0.0f; float deltaExpandSize = 0.0f;
if (nbWidgetExpand != ivec2(0,0)) { if (nbWidgetExpand != ivec2(0,0)) {
if (m_mode == ewol::widget::Sizer::modeVert) { if (propertyMode == ewol::widget::Sizer::modeVert) {
deltaExpandSize = (localWidgetSize.y() - minSize.y()) / float(nbWidgetExpand.y()); deltaExpandSize = (localWidgetSize.y() - minSize.y()) / float(nbWidgetExpand.y());
} else { } else {
deltaExpandSize = (localWidgetSize.x() - minSize.x()) / float(nbWidgetExpand.x()); deltaExpandSize = (localWidgetSize.x() - minSize.x()) / float(nbWidgetExpand.x());
@ -84,7 +86,7 @@ void ewol::widget::Sizer::onChangeSize() {
float residualNext = 0.0f; float residualNext = 0.0f;
// get the number of element that need to devide... // get the number of element that need to devide...
int32_t countCalculation = nbWidgetExpand.x(); int32_t countCalculation = nbWidgetExpand.x();
if (m_mode == ewol::widget::Sizer::modeVert) { if (propertyMode == ewol::widget::Sizer::modeVert) {
countCalculation = nbWidgetExpand.y(); countCalculation = nbWidgetExpand.y();
} }
// -4.1- Update every subWidget size // -4.1- Update every subWidget size
@ -95,7 +97,7 @@ void ewol::widget::Sizer::onChangeSize() {
vec2 tmpSizeMin = it->getSize(); vec2 tmpSizeMin = it->getSize();
vec2 tmpSizeMax = it->getCalculateMaxSize(); vec2 tmpSizeMax = it->getCalculateMaxSize();
// Now update his size his size in X and the curent sizer size in Y: // Now update his size his size in X and the curent sizer size in Y:
if (m_mode == ewol::widget::Sizer::modeVert) { if (propertyMode == ewol::widget::Sizer::modeVert) {
if (it->canExpand().y() == true) { if (it->canExpand().y() == true) {
float sizeExpand = tmpSizeMin.y() + deltaExpandSize; float sizeExpand = tmpSizeMin.y() + deltaExpandSize;
if (sizeExpand > tmpSizeMax.y()) { if (sizeExpand > tmpSizeMax.y()) {
@ -127,7 +129,7 @@ void ewol::widget::Sizer::onChangeSize() {
if (countCalculation <= 0) { if (countCalculation <= 0) {
break; break;
} }
if (m_mode == ewol::widget::Sizer::modeVert) { if (propertyMode == ewol::widget::Sizer::modeVert) {
deltaExpandSize = residualNext / float(countCalculation); deltaExpandSize = residualNext / float(countCalculation);
} else { } else {
deltaExpandSize = residualNext / float(countCalculation); deltaExpandSize = residualNext / float(countCalculation);
@ -143,7 +145,7 @@ void ewol::widget::Sizer::onChangeSize() {
continue; continue;
} }
// Now update his size his size in X and the curent sizer size in Y: // Now update his size his size in X and the curent sizer size in Y:
if (m_mode == ewol::widget::Sizer::modeVert) { if (propertyMode == ewol::widget::Sizer::modeVert) {
if (it->canExpand().x() == false) { if (it->canExpand().x() == false) {
continue; continue;
} }
@ -173,7 +175,7 @@ void ewol::widget::Sizer::onChangeSize() {
continue; continue;
} }
vec2 size = it->getSize(); vec2 size = it->getSize();
if (m_mode == ewol::widget::Sizer::modeVert) { if (propertyMode == ewol::widget::Sizer::modeVert) {
underSize += vec2(0.0f, size.y()); underSize += vec2(0.0f, size.y());
underSize.setX(std::max(underSize.x(), size.x())); underSize.setX(std::max(underSize.x(), size.x()));
} else { } else {
@ -184,7 +186,7 @@ void ewol::widget::Sizer::onChangeSize() {
vec2 deltas = localWidgetSize - underSize; vec2 deltas = localWidgetSize - underSize;
// -8- Calculate the local origin, depending of the gravity: // -8- Calculate the local origin, depending of the gravity:
vec2 tmpOrigin = m_origin + tmpBorderSize + ewol::gravityGenerateDelta(m_gravity, deltas); vec2 tmpOrigin = m_origin + tmpBorderSize + ewol::gravityGenerateDelta(propertyGravity, deltas);
// -9- Set sub widget origin: // -9- Set sub widget origin:
for (auto &it : m_subWidget) { for (auto &it : m_subWidget) {
if (it == nullptr) { if (it == nullptr) {
@ -192,13 +194,13 @@ void ewol::widget::Sizer::onChangeSize() {
} }
vec2 origin; vec2 origin;
vec2 size = it->getSize(); vec2 size = it->getSize();
if (m_mode == ewol::widget::Sizer::modeVert) { if (propertyMode == ewol::widget::Sizer::modeVert) {
origin = vec2ClipInt32(tmpOrigin+m_offset + ewol::gravityGenerateDelta(m_gravity, vec2(underSize.x()-size.x(),0.0f))); origin = vec2ClipInt32(tmpOrigin+m_offset + ewol::gravityGenerateDelta(propertyGravity, vec2(underSize.x()-size.x(),0.0f)));
} else { } else {
origin = vec2ClipInt32(tmpOrigin+m_offset + ewol::gravityGenerateDelta(m_gravity, vec2(0.0f, underSize.y()-size.y()))); origin = vec2ClipInt32(tmpOrigin+m_offset + ewol::gravityGenerateDelta(propertyGravity, vec2(0.0f, underSize.y()-size.y())));
} }
it->setOrigin(origin); it->setOrigin(origin);
if (m_mode == ewol::widget::Sizer::modeVert) { if (propertyMode == ewol::widget::Sizer::modeVert) {
tmpOrigin.setY(tmpOrigin.y() + size.y()); tmpOrigin.setY(tmpOrigin.y() + size.y());
} else { } else {
tmpOrigin.setX(tmpOrigin.x() + size.x()); tmpOrigin.setX(tmpOrigin.x() + size.x());
@ -217,8 +219,8 @@ void ewol::widget::Sizer::onChangeSize() {
void ewol::widget::Sizer::calculateMinMaxSize() { void ewol::widget::Sizer::calculateMinMaxSize() {
EWOL_VERBOSE("[" << getId() << "] update minimum size"); EWOL_VERBOSE("[" << getId() << "] update minimum size");
m_subExpend.setValue(false, false); m_subExpend.setValue(false, false);
m_minSize = m_userMinSize->getPixel(); m_minSize = propertyMinSize->getPixel();
vec2 tmpBorderSize = m_borderSize->getPixel(); vec2 tmpBorderSize = propertyBorderSize->getPixel();
EWOL_VERBOSE("[" << getId() << "] {" << getObjectType() << "} set min size : " << m_minSize); EWOL_VERBOSE("[" << getId() << "] {" << getObjectType() << "} set min size : " << m_minSize);
for (auto &it : m_subWidget) { for (auto &it : m_subWidget) {
if (it == nullptr) { if (it == nullptr) {
@ -234,7 +236,7 @@ void ewol::widget::Sizer::calculateMinMaxSize() {
vec2 tmpSize = it->getCalculateMinSize(); vec2 tmpSize = it->getCalculateMinSize();
EWOL_VERBOSE("[" << getId() << "] NewMinSize=" << tmpSize); EWOL_VERBOSE("[" << getId() << "] NewMinSize=" << tmpSize);
EWOL_VERBOSE("[" << getId() << "] {" << getObjectType() << "} Get minSize="<< tmpSize); EWOL_VERBOSE("[" << getId() << "] {" << getObjectType() << "} Get minSize="<< tmpSize);
if (m_mode == ewol::widget::Sizer::modeVert) { if (propertyMode == ewol::widget::Sizer::modeVert) {
m_minSize.setY(m_minSize.y() + tmpSize.y()); m_minSize.setY(m_minSize.y() + tmpSize.y());
if (tmpSize.x()>m_minSize.x()) { if (tmpSize.x()>m_minSize.x()) {
m_minSize.setX(tmpSize.x()); m_minSize.setX(tmpSize.x());
@ -251,7 +253,7 @@ void ewol::widget::Sizer::calculateMinMaxSize() {
} }
int32_t ewol::widget::Sizer::subWidgetAdd(std::shared_ptr<ewol::Widget> _newWidget) { int32_t ewol::widget::Sizer::subWidgetAdd(std::shared_ptr<ewol::Widget> _newWidget) {
if (m_animation == animationNone) { if (propertyAnimation == animationNone) {
return ewol::widget::ContainerN::subWidgetAdd(_newWidget); return ewol::widget::ContainerN::subWidgetAdd(_newWidget);
} }
// TODO : ... // TODO : ...
@ -259,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) { int32_t ewol::widget::Sizer::subWidgetAddStart(std::shared_ptr<ewol::Widget> _newWidget) {
if (m_animation == animationNone) { if (propertyAnimation == animationNone) {
return ewol::widget::ContainerN::subWidgetAddStart(_newWidget); return ewol::widget::ContainerN::subWidgetAddStart(_newWidget);
} }
// TODO : ... // TODO : ...
@ -267,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) { void ewol::widget::Sizer::subWidgetRemove(std::shared_ptr<ewol::Widget> _newWidget) {
if (m_animation == animationNone) { if (propertyAnimation == animationNone) {
ewol::widget::ContainerN::subWidgetRemove(_newWidget); ewol::widget::ContainerN::subWidgetRemove(_newWidget);
return; return;
} }
@ -276,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) { void ewol::widget::Sizer::subWidgetUnLink(std::shared_ptr<ewol::Widget> _newWidget) {
if (m_animation == animationNone) { if (propertyAnimation == animationNone) {
ewol::widget::ContainerN::subWidgetUnLink(_newWidget); ewol::widget::ContainerN::subWidgetUnLink(_newWidget);
return; return;
} }
@ -286,10 +288,10 @@ void ewol::widget::Sizer::subWidgetUnLink(std::shared_ptr<ewol::Widget> _newWidg
void ewol::widget::Sizer::onPropertyChangeValue(const eproperty::Ref& _paramPointer) { void ewol::widget::Sizer::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::widget::ContainerN::onPropertyChangeValue(_paramPointer); ewol::widget::ContainerN::onPropertyChangeValue(_paramPointer);
if (_paramPointer == m_mode) { if (_paramPointer == propertyMode) {
markToRedraw(); markToRedraw();
requestUpdateSize(); requestUpdateSize();
} else if (_paramPointer == m_borderSize) { } else if (_paramPointer == propertyBorderSize) {
markToRedraw(); markToRedraw();
requestUpdateSize(); requestUpdateSize();
} }

99
ewol/widget/Sizer.h
View File

@ -20,18 +20,29 @@ namespace ewol {
* @ingroup ewolWidgetGroup * @ingroup ewolWidgetGroup
*/ */
class Sizer : public ewol::widget::ContainerN { class Sizer : public ewol::widget::ContainerN {
public:
/**
* @brief Main call of recording the widget on the List of "widget named creator"
*/
static void init(ewol::widget::Manager& _widgetManager);
public: public:
enum displayMode { enum displayMode {
modeVert, //!< Vertical mode modeVert, //!< Vertical mode
modeHori, //!< Horizontal mode modeHori, //!< Horizontal mode
}; };
protected: enum animation {
eproperty::List<enum displayMode> m_mode; //!< Methode to display the widget list (vert/hory ...) animationNone, //!< No annimation
animationTop, //!< element came from the top
animationbuttom, //!< element came from the buttom
animationLeft, //!< element came from the Left
animationRight //!< element came from the right
//animationZoom //!< element came from zooming
};
public: // properties:
eproperty::List<enum displayMode> propertyMode; //!< Methode to display the widget list (vert/hory ...)
eproperty::Value<gale::Dimension> propertyBorderSize; //!< Border size needed for all the display
eproperty::List<enum animation> propertyAnimation; //!< Methode add and remove element (animation)
eproperty::Value<float> propertyAnimationTime; //!< Time in second to generate animation
public:
/**
* @brief Main call of recording the widget on the List of "widget named creator"
*/
static void init(ewol::widget::Manager& _widgetManager);
protected: protected:
/** /**
* @brief Constructor * @brief Constructor
@ -45,80 +56,6 @@ namespace ewol {
* @brief Destructor * @brief Destructor
*/ */
virtual ~Sizer(); virtual ~Sizer();
/**
* @brief set the mode to display elements.
* @param[in] _mode The mode to display the elements.
*/
void setMode(enum displayMode _mode) {
m_mode.set(_mode);
}
/**
* @brief get the mode to display elements.
* @return The current mode to display the elements.
*/
enum displayMode getMode() const {
return m_mode;
}
protected:
eproperty::Value<gale::Dimension> m_borderSize; //!< Border size needed for all the display
public:
/**
* @brief set the current border size of the current element:
* @param[in] _newBorderSize The border size to set (0 if not used)
*/
void setBorderSize(const gale::Dimension& _newBorderSize) {
m_borderSize.set(_newBorderSize);
}
/**
* @brief get the current border size of the current element:
* @return the border size (0 if not used)
*/
const gale::Dimension& getBorderSize() const {
return m_borderSize;
};
public:
enum animation {
animationNone, //!< No annimation
animationTop, //!< element came from the top
animationbuttom, //!< element came from the buttom
animationLeft, //!< element came from the Left
animationRight //!< element came from the right
//animationZoom //!< element came from zooming
};
protected:
enum animation m_animation; //!< Methode add and remove element (animation)
public:
/**
* @brief set an animation mode for the new element set in the Widget container.
* @param[in] _animation The new animation mode.
*/
void setAnimationMode(enum animation _animation) {
m_animation = _animation;
};
/**
* @brief get the current animation mode.
* @return The animation mode.
*/
enum animation getAnimationMode() {
return m_animation;
};
protected:
float m_animationTime; //!< Time in second to generate animation
public:
/**
* @brief set the time to produce animation.
* @param[in] _time The new animation time.
*/
void setAnimationTime(float _time) {
m_animationTime = _time;
};
/**
* @brief get the current animation time.
* @return The time to produce the animation.
*/
float getAnimationTime() {
return m_animationTime;
};
public: // Derived function public: // Derived function
virtual void onChangeSize(); virtual void onChangeSize();
virtual void calculateMinMaxSize(); virtual void calculateMinMaxSize();

50
ewol/widget/Slider.cpp
View File

@ -17,23 +17,23 @@ const int32_t dotRadius = 6;
ewol::widget::Slider::Slider() : ewol::widget::Slider::Slider() :
signalChange(*this, "change"), signalChange(*this, "change"),
m_value(*this, "value", 0.0f, "Value of the Slider"), propertyValue(*this, "value", 0.0f, "Value of the Slider"),
m_min(*this, "min", 0.0f, "Minium value"), propertyMinimum(*this, "min", 0.0f, "Minium value"),
m_max(*this, "max", 10.0f, "Maximum value"), propertyMaximum(*this, "max", 10.0f, "Maximum value"),
m_step(*this, "step", 1.0f, "Step size") { propertyStep(*this, "step", 1.0f, "Step size") {
addObjectType("ewol::widget::Slider"); addObjectType("ewol::widget::Slider");
m_textColorFg = etk::color::black; m_textColorFg = etk::color::black;
m_textColorBg = etk::color::black; m_textColorBg = etk::color::black;
m_textColorBg.setA(0x3F); m_textColorBg.setA(0x3F);
setCanHaveFocus(true);
// Limit event at 1: // Limit event at 1:
setMouseLimit(1); setMouseLimit(1);
} }
void ewol::widget::Slider::init() { void ewol::widget::Slider::init() {
ewol::Widget::init(); ewol::Widget::init();
propertyCanFocus.set(true);
} }
ewol::widget::Slider::~Slider() { ewol::widget::Slider::~Slider() {
@ -41,7 +41,7 @@ ewol::widget::Slider::~Slider() {
} }
void ewol::widget::Slider::calculateMinMaxSize() { void ewol::widget::Slider::calculateMinMaxSize() {
vec2 minTmp = m_userMinSize->getPixel(); vec2 minTmp = propertyMinSize->getPixel();
m_minSize.setValue(std::max(minTmp.x(), 40.0f), m_minSize.setValue(std::max(minTmp.x(), 40.0f),
std::max(minTmp.y(), dotRadius*2.0f) ); std::max(minTmp.y(), dotRadius*2.0f) );
markToRedraw(); markToRedraw();
@ -66,7 +66,7 @@ void ewol::widget::Slider::onRegenerateDisplay() {
etk::Color<> borderDot = m_textColorFg; etk::Color<> borderDot = m_textColorFg;
borderDot.setA(borderDot.a()/2); borderDot.setA(borderDot.a()/2);
m_draw.setPos(vec3(4+((m_value-m_min)/(m_max-m_min))*(m_size.x()-2*dotRadius), m_size.y()/2, 0) ); m_draw.setPos(vec3(4+((propertyValue-propertyMinimum)/(propertyMaximum-propertyMinimum))*(m_size.x()-2*dotRadius), m_size.y()/2, 0) );
m_draw.setColorBg(borderDot); m_draw.setColorBg(borderDot);
m_draw.circle(dotRadius); m_draw.circle(dotRadius);
m_draw.setColorBg(m_textColorFg); m_draw.setColorBg(m_textColorFg);
@ -81,11 +81,11 @@ bool ewol::widget::Slider::onEventInput(const ewol::event::Input& _event) {
|| gale::key::status_move == _event.getStatus()) { || gale::key::status_move == _event.getStatus()) {
// get the new position : // get the new position :
EWOL_VERBOSE("Event on Slider (" << relativePos.x() << "," << relativePos.y() << ")"); EWOL_VERBOSE("Event on Slider (" << relativePos.x() << "," << relativePos.y() << ")");
float oldValue = m_value.get(); float oldValue = propertyValue.get();
updateValue(m_min + (float)(relativePos.x() - dotRadius) / (m_size.x()-2*dotRadius) * (m_max-m_min)); updateValue(propertyMinimum + (float)(relativePos.x() - dotRadius) / (m_size.x()-2*dotRadius) * (propertyMaximum-propertyMinimum));
if (oldValue != m_value) { if (oldValue != propertyValue) {
EWOL_VERBOSE(" new value : " << m_value << " in [" << m_min << ".." << m_max << "]"); EWOL_VERBOSE(" new value : " << propertyValue << " in [" << propertyMinimum << ".." << propertyMaximum << "]");
signalChange.emit(m_value); signalChange.emit(propertyValue);
} }
return true; return true;
} }
@ -94,12 +94,12 @@ bool ewol::widget::Slider::onEventInput(const ewol::event::Input& _event) {
} }
void ewol::widget::Slider::updateValue(float _newValue) { void ewol::widget::Slider::updateValue(float _newValue) {
_newValue = std::max(std::min(_newValue, m_max.get()), m_min.get()); _newValue = std::max(std::min(_newValue, propertyMaximum.get()), propertyMinimum.get());
if (m_step.get() == 0.0f) { if (propertyStep.get() == 0.0f) {
m_value = _newValue; propertyValue = _newValue;
} else { } else {
float basicVal = (int64_t)(_newValue / m_step.get()); float basicVal = (int64_t)(_newValue / propertyStep.get());
m_value = basicVal * m_step.get(); propertyValue = basicVal * propertyStep.get();
} }
markToRedraw(); markToRedraw();
} }
@ -107,20 +107,20 @@ void ewol::widget::Slider::updateValue(float _newValue) {
// TODO : Review this really bad things ... // TODO : Review this really bad things ...
void ewol::widget::Slider::onPropertyChangeValue(const eproperty::Ref& _paramPointer) { void ewol::widget::Slider::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::Widget::onPropertyChangeValue(_paramPointer); ewol::Widget::onPropertyChangeValue(_paramPointer);
if (_paramPointer == m_value) { if (_paramPointer == propertyValue) {
updateValue(m_value.get()); updateValue(propertyValue.get());
return; return;
} }
if (_paramPointer == m_min) { if (_paramPointer == propertyMinimum) {
updateValue(m_value.get()); updateValue(propertyValue.get());
return; return;
} }
if (_paramPointer == m_max) { if (_paramPointer == propertyMaximum) {
updateValue(m_value.get()); updateValue(propertyValue.get());
return; return;
} }
if (_paramPointer == m_step) { if (_paramPointer == propertyStep) {
updateValue(m_value.get()); updateValue(propertyValue.get());
return; return;
} }
} }

77
ewol/widget/Slider.h
View File

@ -20,83 +20,20 @@ namespace ewol {
* @ingroup ewolWidgetGroup * @ingroup ewolWidgetGroup
*/ */
class Slider : public ewol::Widget { class Slider : public ewol::Widget {
public: public: // signals
// Event list of properties
esignal::Signal<float> signalChange; esignal::Signal<float> signalChange;
public:
//eproperty::Value<std::string> propertyShape; //!< name of the shape used
eproperty::Value<float> propertyValue; //!< current value of the Slider
eproperty::Value<float> propertyMinimum; //!< minimum value of the slider
eproperty::Value<float> propertyMaximum; //!< maximum value of the slider
eproperty::Value<float> propertyStep; //!< step of every iteration of the slider (increment/precision)
protected: protected:
Slider(); Slider();
void init(); void init();
public: public:
DECLARE_WIDGET_FACTORY(Slider, "Slider"); DECLARE_WIDGET_FACTORY(Slider, "Slider");
virtual ~Slider(); virtual ~Slider();
protected:
eproperty::Value<float> m_value; //!< current value of the Slider
public:
/**
* @brief Set the value of the slider.
* @param[in] _val New value to apply.
*/
void setValue(float _val) {
m_value.set(_val);
}
/**
* @brief Get the value of the slider.
* @return The current value of the slider.
*/
float getValue() {
return m_value;
}
protected:
eproperty::Value<float> m_min; //!< minimum value of the slider
public:
/**
* @brief Set the minumum value of the slider.
* @param[in] _val New minimum value to apply.
*/
void setMin(float _val) {
m_min.set(_val);
}
/**
* @brief Get the minimum value of the slider.
* @return The minimum value of the slider.
*/
float getMin() {
return m_min;
}
protected:
eproperty::Value<float> m_max; //!< maximum value of the slider
public:
/**
* @brief Set the maximum value of the slider.
* @param[in] _val New maximum value to apply.
*/
void setMax(float _val) {
m_max.set(_val);
}
/**
* @brief Get the maximum value of the slider.
* @return The maximum value of the slider.
*/
float getMax() {
return m_max;
}
protected:
eproperty::Value<float> m_step;
public:
/**
* @brief Set the step value of the slider.
* @param[in] _val New step value to apply.
*/
void setStep(float _val) {
m_step.set(_val);
}
/**
* @brief Get the step value of the slider.
* @return The wtep value of the slider.
*/
float getStep() {
return m_step;
}
public: public:
// TODO : Rewoek the color in the theme ... // TODO : Rewoek the color in the theme ...
void setColor(etk::Color<> _newColor) { void setColor(etk::Color<> _newColor) {

12
ewol/widget/Spacer.cpp
View File

@ -15,14 +15,14 @@
#define __class__ "Spacer" #define __class__ "Spacer"
ewol::widget::Spacer::Spacer() : ewol::widget::Spacer::Spacer() :
m_color(*this, "color", etk::color::none, "background of the spacer") { propertyColor(*this, "color", etk::color::none, "background of the spacer") {
addObjectType("ewol::widget::Spacer"); addObjectType("ewol::widget::Spacer");
m_userMinSize = gale::Dimension(vec2(10,10));
setCanHaveFocus(false);
} }
void ewol::widget::Spacer::init() { void ewol::widget::Spacer::init() {
ewol::Widget::init(); ewol::Widget::init();
propertyMinSize.set(gale::Dimension(vec2(10,10)));
propertyCanFocus.set(true);
} }
ewol::widget::Spacer::~Spacer() { ewol::widget::Spacer::~Spacer() {
@ -40,17 +40,17 @@ void ewol::widget::Spacer::onRegenerateDisplay() {
} }
m_draw.clear(); m_draw.clear();
if (m_color->a() == 0) { if (propertyColor->a() == 0) {
return; return;
} }
m_draw.setColor(m_color); m_draw.setColor(propertyColor);
m_draw.setPos(vec3(0, 0, 0) ); m_draw.setPos(vec3(0, 0, 0) );
m_draw.rectangleWidth(vec3(m_size.x(), m_size.y(),0) ); m_draw.rectangleWidth(vec3(m_size.x(), m_size.y(),0) );
} }
void ewol::widget::Spacer::onPropertyChangeValue(const eproperty::Ref& _paramPointer) { void ewol::widget::Spacer::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::Widget::onPropertyChangeValue(_paramPointer); ewol::Widget::onPropertyChangeValue(_paramPointer);
if (_paramPointer == m_color) { if (_paramPointer == propertyColor) {
markToRedraw(); markToRedraw();
} }
} }

17
ewol/widget/Spacer.h
View File

@ -20,8 +20,8 @@ namespace ewol {
* @ingroup ewolWidgetGroup * @ingroup ewolWidgetGroup
*/ */
class Spacer : public ewol::Widget { class Spacer : public ewol::Widget {
private: public: // properties:
ewol::compositing::Drawing m_draw; //!< Compositing drawing element eproperty::Value<etk::Color<>> propertyColor; //!< Background color
protected: protected:
/** /**
* @brief Main constructer * @brief Main constructer
@ -34,17 +34,8 @@ namespace ewol {
* @brief Main destructer * @brief Main destructer
*/ */
virtual ~Spacer(); virtual ~Spacer();
protected: private:
eproperty::Value<etk::Color<>> m_color; //!< Background color ewol::compositing::Drawing m_draw; //!< Compositing drawing element
public:
/**
* @brief Spziby the background color (basicly transparent)
* @param[in] newColor the display background color
*/
void setColor(etk::Color<> _newColor) {
m_color = _newColor;
markToRedraw();
};
public: // Derived function public: // Derived function
virtual std::shared_ptr<ewol::Widget> getWidgetAtPos(const vec2& _pos) { return nullptr; }; virtual std::shared_ptr<ewol::Widget> getWidgetAtPos(const vec2& _pos) { return nullptr; };
virtual void onRegenerateDisplay(); virtual void onRegenerateDisplay();

37
ewol/widget/Spin.cpp
View File

@ -15,15 +15,14 @@
#undef __class__ #undef __class__
#define __class__ "widget::Spin" #define __class__ "widget::Spin"
ewol::widget::Spin::Spin() : ewol::widget::Spin::Spin() :
signalValue(*this, "value", "Spin value change"), signalValue(*this, "value", "Spin value change"),
signalValueDouble(*this, "valueDouble", "Spin value change value in 'double'"), signalValueDouble(*this, "valueDouble", "Spin value change value in 'double'"),
m_value(*this, "value", 0, "Value of the Spin"), propertyValue(*this, "value", 0, "Value of the Spin"),
m_min(*this, "min", -9999999999, "Minimum value of the spin"), propertyMin(*this, "min", -9999999999, "Minimum value of the spin"),
m_max(*this, "max", 9999999999, "Maximum value of the spin"), propertyMax(*this, "max", 9999999999, "Maximum value of the spin"),
m_increment(*this, "increment", 1, "Increment value at each button event or keybord event"), propertyIncrement(*this, "increment", 1, "Increment value at each button event or keybord event"),
m_mantis(*this, "mantis", 0, "fix-point mantis") { propertyMantis(*this, "mantis", 0, "fix-point mantis") {
addObjectType("ewol::widget::Spin"); addObjectType("ewol::widget::Spin");
} }
@ -41,20 +40,20 @@ ewol::widget::Spin::~Spin() {
void ewol::widget::Spin::onPropertyChangeValue(const eproperty::Ref& _paramPointer) { void ewol::widget::Spin::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::widget::SpinBase::onPropertyChangeValue(_paramPointer); ewol::widget::SpinBase::onPropertyChangeValue(_paramPointer);
if (_paramPointer == m_value) { if (_paramPointer == propertyValue) {
markToRedraw(); markToRedraw();
if (m_widgetEntry == nullptr) { if (m_widgetEntry == nullptr) {
EWOL_ERROR("Can not acces at entry ..."); EWOL_ERROR("Can not acces at entry ...");
return; return;
} }
checkValue(m_value.get()); checkValue(propertyValue.get());
} else if (_paramPointer == m_min) { } else if (_paramPointer == propertyMin) {
checkValue(m_value.get()); checkValue(propertyValue.get());
} else if (_paramPointer == m_max) { } else if (_paramPointer == propertyMax) {
checkValue(m_value.get()); checkValue(propertyValue.get());
} else if (_paramPointer == m_increment) { } else if (_paramPointer == propertyIncrement) {
} else if (_paramPointer == m_mantis) { } else if (_paramPointer == propertyMantis) {
} }
} }
@ -79,17 +78,17 @@ void ewol::widget::Spin::updateGui() {
} }
void ewol::widget::Spin::checkValue(int64_t _value) { void ewol::widget::Spin::checkValue(int64_t _value) {
_value = std::avg(m_min.get(), _value, m_max.get()); _value = std::avg(propertyMin.get(), _value, propertyMax.get());
m_value.get() = _value; propertyValue.get() = _value;
m_widgetEntry->setValue(etk::to_string(_value)); m_widgetEntry->propertyValue.set(etk::to_string(_value));
} }
void ewol::widget::Spin::onCallbackUp() { void ewol::widget::Spin::onCallbackUp() {
int64_t value = m_value.get() + m_increment.get(); int64_t value = propertyValue.get() + propertyIncrement.get();
checkValue(value); checkValue(value);
} }
void ewol::widget::Spin::onCallbackDown() { void ewol::widget::Spin::onCallbackDown() {
int64_t value = m_value.get() - m_increment.get(); int64_t value = propertyValue.get() - propertyIncrement.get();
checkValue(value); checkValue(value);
} }

54
ewol/widget/WSlider.cpp
View File

@ -26,16 +26,16 @@ std::ostream& operator <<(std::ostream& _os, const enum ewol::widget::WSlider::s
ewol::widget::WSlider::WSlider() : ewol::widget::WSlider::WSlider() :
signalStartSlide(*this, "start"), signalStartSlide(*this, "start"),
signalStopSlide(*this, "stop"), signalStopSlide(*this, "stop"),
propertyTransitionSpeed(*this, "speed", 1.0f, 0.0f, 200.0f, "Transition speed of the slider"),
propertyTransitionMode(*this, "mode", sladingTransitionHori, "Transition mode of the slider"),
propertySelectWidget(*this, "select", "", "Select the requested widget to display"),
m_windowsSources(0), m_windowsSources(0),
m_windowsDestination(0), m_windowsDestination(0),
m_windowsRequested(-1), m_windowsRequested(-1),
m_slidingProgress(1.0f), m_slidingProgress(1.0f) {
m_selectNewWidget(*this, "select", "", "Select the requested widget to display"),
m_transitionSpeed(*this, "speed", 1.0f, 0.0f, 200.0f, "Transition speed of the slider"),
m_transitionSlide(*this, "mode", sladingTransitionHori, "Transition mode of the slider") {
addObjectType("ewol::widget::WSlider"); addObjectType("ewol::widget::WSlider");
m_transitionSlide.add(sladingTransitionVert, "vert"); propertyTransitionMode.add(sladingTransitionVert, "vert");
m_transitionSlide.add(sladingTransitionHori, "hori"); propertyTransitionMode.add(sladingTransitionHori, "hori");
} }
ewol::widget::WSlider::~WSlider() { ewol::widget::WSlider::~WSlider() {
@ -63,7 +63,7 @@ void ewol::widget::WSlider::onChangeSize() {
std::advance(it, m_windowsSources); std::advance(it, m_windowsSources);
if ( it != m_subWidget.end() if ( it != m_subWidget.end()
&& *it != nullptr) { && *it != nullptr) {
if (m_transitionSlide == sladingTransitionHori) { if (propertyTransitionMode == sladingTransitionHori) {
(*it)->setOrigin( vec2(m_origin.x() + factor*(m_size.x()*m_slidingProgress), (*it)->setOrigin( vec2(m_origin.x() + factor*(m_size.x()*m_slidingProgress),
m_origin.y()) m_origin.y())
+ m_offset); + m_offset);
@ -79,7 +79,7 @@ void ewol::widget::WSlider::onChangeSize() {
std::advance(it, m_windowsDestination); std::advance(it, m_windowsDestination);
if ( it != m_subWidget.end() if ( it != m_subWidget.end()
&& *it != nullptr) { && *it != nullptr) {
if (m_transitionSlide == sladingTransitionHori) { if (propertyTransitionMode == sladingTransitionHori) {
(*it)->setOrigin( vec2(m_origin.x() + factor*(m_size.x()*m_slidingProgress - m_size.x()), (*it)->setOrigin( vec2(m_origin.x() + factor*(m_size.x()*m_slidingProgress - m_size.x()),
m_origin.y()) m_origin.y())
+ m_offset); + m_offset);
@ -115,11 +115,11 @@ void ewol::widget::WSlider::subWidgetSelectSet(int32_t _id) {
elementID ++; elementID ++;
if (it != nullptr) { if (it != nullptr) {
if (it->getId() == _id) { if (it->getId() == _id) {
if (it->getName() != "") { if (it->propertyName.get() != "") {
// change the internal event parameter (in case...) ==> no event generation // change the internal event parameter (in case...) ==> no event generation
m_selectNewWidget.get() = it->getName(); propertySelectWidget.get() = it->propertyName.get();
} else { } else {
m_selectNewWidget.get() = ""; propertySelectWidget.get() = "";
} }
break; break;
} }
@ -130,7 +130,7 @@ void ewol::widget::WSlider::subWidgetSelectSet(int32_t _id) {
} else { } else {
subWidgetSelectSetVectorId(-1); subWidgetSelectSetVectorId(-1);
// change the internal event parameter (in case...) ==> no event generation // change the internal event parameter (in case...) ==> no event generation
m_selectNewWidget.get() = ""; propertySelectWidget.get() = "";
} }
} }
@ -144,11 +144,11 @@ void ewol::widget::WSlider::subWidgetSelectSet(const std::shared_ptr<ewol::Widge
if ( it != nullptr if ( it != nullptr
&& it == _widgetPointer) { && it == _widgetPointer) {
subWidgetSelectSetVectorId(iii); subWidgetSelectSetVectorId(iii);
if (_widgetPointer->getName() != "") { if (_widgetPointer->propertyName.get() != "") {
// change the internal event parameter (in case...) ==> no event generation // change the internal event parameter (in case...) ==> no event generation
m_selectNewWidget.get() = _widgetPointer->getName(); propertySelectWidget.get() = _widgetPointer->propertyName.get();
} else { } else {
m_selectNewWidget.get() = ""; propertySelectWidget.get() = "";
} }
return; return;
} }
@ -165,10 +165,10 @@ void ewol::widget::WSlider::subWidgetSelectSet(const std::string& _widgetName) {
int32_t iii = 0; int32_t iii = 0;
for (auto &it : m_subWidget) { for (auto &it : m_subWidget) {
if ( it != nullptr if ( it != nullptr
&& it->getName() == _widgetName) { && it->propertyName.get() == _widgetName) {
subWidgetSelectSetVectorId(iii); subWidgetSelectSetVectorId(iii);
// change the internal event parameter (in case...) ==> no event generation // change the internal event parameter (in case...) ==> no event generation
m_selectNewWidget.get() = _widgetName; propertySelectWidget.get() = _widgetName;
return; return;
} }
iii++; iii++;
@ -192,7 +192,8 @@ void ewol::widget::WSlider::periodicCall(const ewol::event::Time& _event) {
} }
if (m_slidingProgress < 1.0) { if (m_slidingProgress < 1.0) {
if (m_windowsRequested != -1 && m_slidingProgress<0.5 ) { if ( m_windowsRequested != -1
&& m_slidingProgress<0.5 ) {
// invert sources with destination // invert sources with destination
int32_t tmppp = m_windowsDestination; int32_t tmppp = m_windowsDestination;
m_windowsDestination = m_windowsSources; m_windowsDestination = m_windowsSources;
@ -202,14 +203,14 @@ void ewol::widget::WSlider::periodicCall(const ewol::event::Time& _event) {
m_windowsRequested = -1; m_windowsRequested = -1;
} }
} }
m_slidingProgress += _event.getDeltaCall()/m_transitionSpeed; m_slidingProgress += _event.getDeltaCall()/propertyTransitionSpeed;
m_slidingProgress = std::avg(0.0f, m_slidingProgress, 1.0f); m_slidingProgress = std::avg(0.0f, m_slidingProgress, 1.0f);
} }
onChangeSize(); onChangeSize();
} }
void ewol::widget::WSlider::systemDraw(const ewol::DrawProperty& _displayProp) { void ewol::widget::WSlider::systemDraw(const ewol::DrawProperty& _displayProp) {
if (true == m_hide){ if (propertyHide == true){
// widget is hidden ... // widget is hidden ...
return; return;
} }
@ -270,21 +271,22 @@ void ewol::widget::WSlider::onRegenerateDisplay() {
} }
} }
} }
void ewol::widget::WSlider::onPropertyChangeValue(const eproperty::Ref& _paramPointer) { void ewol::widget::WSlider::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::widget::ContainerN::onPropertyChangeValue(_paramPointer); ewol::widget::ContainerN::onPropertyChangeValue(_paramPointer);
if (_paramPointer == m_selectNewWidget) { if (_paramPointer == propertySelectWidget) {
if (m_selectNewWidget.get() != "") { if (propertySelectWidget.get() != "") {
subWidgetSelectSet(m_selectNewWidget); subWidgetSelectSet(propertySelectWidget);
} }
} else if (_paramPointer == m_transitionSpeed) { } else if (_paramPointer == propertyTransitionSpeed) {
// nothing to do ... // nothing to do ...
} else if (_paramPointer == m_transitionSlide) { } else if (_paramPointer == propertyTransitionMode) {
markToRedraw(); markToRedraw();
} }
} }
std::shared_ptr<ewol::Widget> ewol::widget::WSlider::getWidgetAtPos(const vec2& _pos) { std::shared_ptr<ewol::Widget> ewol::widget::WSlider::getWidgetAtPos(const vec2& _pos) {
if (true == isHide()) { if (propertyHide == true) {
return nullptr; return nullptr;
} }
if (m_windowsDestination == m_windowsSources) { if (m_windowsDestination == m_windowsSources) {

45
ewol/widget/WSlider.h
View File

@ -20,14 +20,18 @@ namespace ewol {
*/ */
class WSlider :public ewol::widget::ContainerN { class WSlider :public ewol::widget::ContainerN {
public: public:
// Event list of properties
esignal::Signal<void> signalStartSlide;
esignal::Signal<void> signalStopSlide;
enum sladingMode { enum sladingMode {
sladingTransitionVert, sladingTransitionVert,
sladingTransitionHori, sladingTransitionHori,
sladingTransition_count, sladingTransition_count,
}; };
public: // signals:
esignal::Signal<void> signalStartSlide;
esignal::Signal<void> signalStopSlide;
public: // properties:
eproperty::Range<float> propertyTransitionSpeed; //!< speed of the transition (default 1 == > 1s)
eproperty::List<enum sladingMode> propertyTransitionMode; //!< mode to slide the widgets
eproperty::Value<std::string> propertySelectWidget; //!< current select configuration
protected: protected:
WSlider(); WSlider();
void init() { void init() {
@ -41,7 +45,6 @@ namespace ewol {
int32_t m_windowsDestination; //!< widget destinated viewed int32_t m_windowsDestination; //!< widget destinated viewed
int32_t m_windowsRequested; //!< widget destination requested when change in modification in progress int32_t m_windowsRequested; //!< widget destination requested when change in modification in progress
float m_slidingProgress; //!< ratio progression of a sliding float m_slidingProgress; //!< ratio progression of a sliding
eproperty::Value<std::string, true> m_selectNewWidget; // input config requesting
protected: protected:
/** /**
* @brief Generate the move on the specific vector ID (This is not a public acces, because the vector can have some null pointer inside ...) * @brief Generate the move on the specific vector ID (This is not a public acces, because the vector can have some null pointer inside ...)
@ -64,40 +67,6 @@ namespace ewol {
* @param[in] _widgetName Name of the subwidget name * @param[in] _widgetName Name of the subwidget name
*/ */
void subWidgetSelectSet(const std::string& _widgetName); void subWidgetSelectSet(const std::string& _widgetName);
private:
eproperty::Range<float> m_transitionSpeed; //!< speed of the transition (default 1 == > 1s)
public:
/**
* @brief set transition speed element.
* @param[in] _timeSecond number of second needed to do the transition.
*/
void setTransitionSpeed(float _timeSecond) {
m_transitionSpeed.set(_timeSecond);
};
/**
* @brief get transition speed element.
* @return number of second needed to do the transition.
*/
float getTransitionSpeed() const {
return m_transitionSpeed;
};
private:
eproperty::List<enum sladingMode> m_transitionSlide; //!< mode to slide the widgets
public:
/**
* @brief set a new mode of sliding element
* @param[in] _mode new display mode
*/
void setTransitionMode(enum sladingMode _mode) {
m_transitionSlide.set(_mode);
}
/**
* @brief get a new mode of sliding element
* @return The current sliding mode
*/
enum sladingMode getTransitionMode() {
return m_transitionSlide;
};
public: // Derived function public: // Derived function
virtual void onChangeSize(); virtual void onChangeSize();
virtual void systemDraw(const ewol::DrawProperty& _displayProp); virtual void systemDraw(const ewol::DrawProperty& _displayProp);

124
ewol/widget/Widget.cpp
View File

@ -18,20 +18,20 @@
#define __class__ "Widget" #define __class__ "Widget"
ewol::Widget::Widget() : ewol::Widget::Widget() :
propertyMinSize(*this, "min-size", gale::Dimension(vec2(0,0),gale::Dimension::Pixel), "User minimum size"),
propertyMaxSize(*this, "max-size", gale::Dimension(vec2(ULTIMATE_MAX_SIZE,ULTIMATE_MAX_SIZE),gale::Dimension::Pixel), "User maximum size"),
propertyExpand(*this, "expand", bvec2(false,false), "Request the widget Expand size wile space is available"),
propertyFill(*this, "fill", bvec2(true,true), "Fill the widget available size"),
propertyHide(*this, "hide", false, "The widget start hided"),
propertyGravity(*this, "gravity", ewol::gravity_buttomLeft, "Gravity orientation"),
propertyCanFocus(*this, "focus", false, "enable the widget to have the focus capacity"), // TODO : je pense que c'est une erreur, c'st surement un event to get the cocus ...
m_size(10,10), m_size(10,10),
m_minSize(0,0), m_minSize(0,0),
m_maxSize(vec2(ULTIMATE_MAX_SIZE,ULTIMATE_MAX_SIZE)), m_maxSize(vec2(ULTIMATE_MAX_SIZE,ULTIMATE_MAX_SIZE)),
m_offset(0,0), m_offset(0,0),
m_zoom(1.0f), m_zoom(1.0f),
m_origin(0,0), m_origin(0,0),
m_userMinSize(*this, "min-size", gale::Dimension(vec2(0,0),gale::Dimension::Pixel), "User minimum size"),
m_userMaxSize(*this, "max-size", gale::Dimension(vec2(ULTIMATE_MAX_SIZE,ULTIMATE_MAX_SIZE),gale::Dimension::Pixel), "User maximum size"),
m_userExpand(*this, "expand", bvec2(false,false), "Request the widget Expand size wile space is available"),
m_userFill(*this, "fill", bvec2(true,true), "Fill the widget available size"),
m_hide(*this, "hide", false, "The widget start hided"),
m_gravity(*this, "gravity", ewol::gravity_buttomLeft, "Gravity orientation"),
m_hasFocus(false), m_hasFocus(false),
m_canFocus(*this, "focus", false, "enable the widget to have the focus capacity"), // TODO : je pense que c'est une erreur, c'st surement un event to get the cocus ...
m_limitMouseEvent(3), m_limitMouseEvent(3),
m_allowRepeateKeyboardEvent(true), m_allowRepeateKeyboardEvent(true),
signalShortcut(*this, "shortcut"), signalShortcut(*this, "shortcut"),
@ -43,24 +43,24 @@ ewol::Widget::Widget() :
signalAnnimationStop(*this, "annimation-stop"), signalAnnimationStop(*this, "annimation-stop"),
m_annimationMode(annimationModeDisable), m_annimationMode(annimationModeDisable),
m_annimationratio(0.0f), m_annimationratio(0.0f),
m_annimationTypeStart(*this, "annimation-start-type", 0, "Annimation type, when adding/show a widget"), propertyAnnimationTypeStart(*this, "annimation-start-type", 0, "Annimation type, when adding/show a widget"),
m_annimationTimeStart(*this, "annimation-start-time", 0.1f, 0.0f, 200.0f, "Annimation time in second, when adding/show a widget"), propertyAnnimationTimeStart(*this, "annimation-start-time", 0.1f, 0.0f, 200.0f, "Annimation time in second, when adding/show a widget"),
m_annimationTypeStop(*this, "annimation-stop-type", 0, "Annimation type, when removing/hide a widget"), propertyAnnimationTypeStop(*this, "annimation-stop-type", 0, "Annimation type, when removing/hide a widget"),
m_annimationTimeStop(*this, "annimation-stop-time", 0.1f, 0.0f, 200.0f, "Annimation time in second, when removing/hide a widget"){ propertyAnnimationTimeStop(*this, "annimation-stop-time", 0.1f, 0.0f, 200.0f, "Annimation time in second, when removing/hide a widget"){
addObjectType("ewol::Widget"); addObjectType("ewol::Widget");
// TODO : Set a static interface for list ==> this methode create a multiple allocation // TODO : Set a static interface for list ==> this methode create a multiple allocation
m_gravity.add(ewol::gravity_center, "center"); propertyGravity.add(ewol::gravity_center, "center");
m_gravity.add(ewol::gravity_topLeft, "top-left"); propertyGravity.add(ewol::gravity_topLeft, "top-left");
m_gravity.add(ewol::gravity_top, "top"); propertyGravity.add(ewol::gravity_top, "top");
m_gravity.add(ewol::gravity_topRight, "top-right"); propertyGravity.add(ewol::gravity_topRight, "top-right");
m_gravity.add(ewol::gravity_right, "right"); propertyGravity.add(ewol::gravity_right, "right");
m_gravity.add(ewol::gravity_buttomRight, "buttom-right"); propertyGravity.add(ewol::gravity_buttomRight, "buttom-right");
m_gravity.add(ewol::gravity_buttom, "buttom"); propertyGravity.add(ewol::gravity_buttom, "buttom");
m_gravity.add(ewol::gravity_buttomLeft, "buttom-left"); propertyGravity.add(ewol::gravity_buttomLeft, "buttom-left");
m_gravity.add(ewol::gravity_left, "left"); propertyGravity.add(ewol::gravity_left, "left");
m_annimationTypeStart.add(0, "none"); propertyAnnimationTypeStart.add(0, "none");
m_annimationTypeStop.add(0, "none"); propertyAnnimationTypeStop.add(0, "none");
} }
void ewol::Widget::init() { void ewol::Widget::init() {
@ -82,7 +82,7 @@ void ewol::Widget::onChangeSize() {
} }
bool ewol::Widget::setFocus() { bool ewol::Widget::setFocus() {
if (m_canFocus == true) { if (propertyCanFocus == true) {
if (m_hasFocus == false) { if (m_hasFocus == false) {
m_hasFocus = true; m_hasFocus = true;
onGetFocus(); onGetFocus();
@ -93,7 +93,7 @@ bool ewol::Widget::setFocus() {
} }
bool ewol::Widget::rmFocus() { bool ewol::Widget::rmFocus() {
if (m_canFocus == true) { if (propertyCanFocus == true) {
if (m_hasFocus == true) { if (m_hasFocus == true) {
m_hasFocus = false; m_hasFocus = false;
onLostFocus(); onLostFocus();
@ -142,7 +142,7 @@ void ewol::Widget::setOffset(const vec2& _newVal) {
(0,0) (0,0)
*/ */
void ewol::Widget::systemDraw(const ewol::DrawProperty& _displayProp) { void ewol::Widget::systemDraw(const ewol::DrawProperty& _displayProp) {
if (true == m_hide){ if (propertyHide == true){
// widget is hidden ... // widget is hidden ...
return; return;
} }
@ -238,16 +238,16 @@ void ewol::Widget::systemDraw(const ewol::DrawProperty& _displayProp) {
} }
void ewol::Widget::periodicCallDisable() { void ewol::Widget::periodicCallDisable() {
EWOL_VERBOSE("Perodic call disable " << getName()); EWOL_VERBOSE("Perodic call disable " << propertyName);
getObjectManager().periodicCall.release(shared_from_this()); getObjectManager().periodicCall.release(shared_from_this());
} }
void ewol::Widget::periodicCallEnable() { void ewol::Widget::periodicCallEnable() {
if (getObjectManager().periodicCall.isRegistered(shared_from_this()) == true) { if (getObjectManager().periodicCall.isRegistered(shared_from_this()) == true) {
EWOL_VERBOSE("Perodic call enable " << getName() << " ==> rejected"); EWOL_VERBOSE("Perodic call enable " << propertyName << " ==> rejected");
return; return;
} else { } else {
EWOL_VERBOSE("Perodic call enable " << getName()); EWOL_VERBOSE("Perodic call enable " << propertyName);
} }
getObjectManager().periodicCall.bind(shared_from_this(), &ewol::Widget::periodicCall); getObjectManager().periodicCall.bind(shared_from_this(), &ewol::Widget::periodicCall);
} }
@ -291,62 +291,62 @@ vec2 ewol::Widget::relativePosition(const vec2& _pos) {
} }
void ewol::Widget::calculateMinMaxSize() { void ewol::Widget::calculateMinMaxSize() {
m_minSize = m_userMinSize->getPixel(); m_minSize = propertyMinSize->getPixel();
//EWOL_ERROR("[" << getId() << "] convert in min size : " << m_userMinSize << " out=" << m_minSize); //EWOL_ERROR("[" << getId() << "] convert in min size : " << propertyMinSize << " out=" << m_minSize);
m_maxSize = m_userMaxSize->getPixel(); m_maxSize = propertyMaxSize->getPixel();
markToRedraw(); markToRedraw();
} }
vec2 ewol::Widget::getCalculateMinSize() { vec2 ewol::Widget::getCalculateMinSize() {
if (false == isHide()) { if (propertyHide == false) {
return m_minSize; return m_minSize;
} }
return vec2(0,0); return vec2(0,0);
} }
vec2 ewol::Widget::getCalculateMaxSize() { vec2 ewol::Widget::getCalculateMaxSize() {
if (false == isHide()) { if (propertyHide == false) {
return m_maxSize; return m_maxSize;
} }
return vec2(ULTIMATE_MAX_SIZE,ULTIMATE_MAX_SIZE); return vec2(ULTIMATE_MAX_SIZE,ULTIMATE_MAX_SIZE);
} }
void ewol::Widget::setNoMinSize() { void ewol::Widget::setNoMinSize() {
m_userMinSize.set(gale::Dimension(vec2(0,0),gale::Dimension::Pixel)); propertyMinSize.set(gale::Dimension(vec2(0,0),gale::Dimension::Pixel));
} }
void ewol::Widget::checkMinSize() { void ewol::Widget::checkMinSize() {
vec2 pixelSize = m_userMinSize->getPixel(); vec2 pixelSize = propertyMinSize->getPixel();
m_minSize.setX(std::max(m_minSize.x(), pixelSize.x())); m_minSize.setX(std::max(m_minSize.x(), pixelSize.x()));
m_minSize.setY(std::max(m_minSize.y(), pixelSize.y())); m_minSize.setY(std::max(m_minSize.y(), pixelSize.y()));
} }
void ewol::Widget::setNoMaxSize() { void ewol::Widget::setNoMaxSize() {
m_userMaxSize.set(gale::Dimension(vec2(ULTIMATE_MAX_SIZE,ULTIMATE_MAX_SIZE),gale::Dimension::Pixel)); propertyMaxSize.set(gale::Dimension(vec2(ULTIMATE_MAX_SIZE,ULTIMATE_MAX_SIZE),gale::Dimension::Pixel));
} }
void ewol::Widget::checkMaxSize() { void ewol::Widget::checkMaxSize() {
vec2 pixelSize = m_userMaxSize->getPixel(); vec2 pixelSize = propertyMaxSize->getPixel();
m_maxSize.setX(std::min(m_maxSize.x(), pixelSize.x())); m_maxSize.setX(std::min(m_maxSize.x(), pixelSize.x()));
m_maxSize.setY(std::min(m_maxSize.y(), pixelSize.y())); m_maxSize.setY(std::min(m_maxSize.y(), pixelSize.y()));
} }
vec2 ewol::Widget::getSize() { vec2 ewol::Widget::getSize() {
if (false == isHide()) { if (propertyHide == false) {
return m_size; return m_size;
} }
return vec2(0,0); return vec2(0,0);
} }
bvec2 ewol::Widget::canExpand() { bvec2 ewol::Widget::canExpand() {
if (false == isHide()) { if (propertyHide == false) {
return m_userExpand; return propertyExpand;
} }
return bvec2(false,false); return bvec2(false,false);
} }
const bvec2& ewol::Widget::canFill() { const bvec2& ewol::Widget::canFill() {
return m_userFill; return propertyFill;
} }
// ---------------------------------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------------------------------
@ -554,25 +554,25 @@ bool ewol::Widget::systemEventInput(ewol::event::InputSystem& _event) {
void ewol::Widget::onPropertyChangeValue(const eproperty::Ref& _paramPointer) { void ewol::Widget::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::Object::onPropertyChangeValue(_paramPointer); ewol::Object::onPropertyChangeValue(_paramPointer);
if (_paramPointer == m_canFocus) { if (_paramPointer == propertyCanFocus) {
if (m_hasFocus == true) { if (m_hasFocus == true) {
rmFocus(); rmFocus();
} }
} else if (_paramPointer == m_gravity) { } else if (_paramPointer == propertyGravity) {
markToRedraw(); markToRedraw();
requestUpdateSize(); requestUpdateSize();
} else if (_paramPointer == m_hide) { } else if (_paramPointer == propertyHide) {
markToRedraw(); markToRedraw();
requestUpdateSize(); requestUpdateSize();
} else if (_paramPointer == m_userFill) { } else if (_paramPointer == propertyFill) {
markToRedraw(); markToRedraw();
requestUpdateSize(); requestUpdateSize();
} else if (_paramPointer == m_userExpand) { } else if (_paramPointer == propertyExpand) {
requestUpdateSize(); requestUpdateSize();
markToRedraw(); markToRedraw();
} else if (_paramPointer == m_userMaxSize) { } else if (_paramPointer == propertyMaxSize) {
vec2 pixelMin = m_userMinSize->getPixel(); vec2 pixelMin = propertyMinSize->getPixel();
vec2 pixelMax = m_userMaxSize->getPixel(); vec2 pixelMax = propertyMaxSize->getPixel();
// check minimum & maximum compatibility : // check minimum & maximum compatibility :
bool error=false; bool error=false;
if (pixelMin.x()>pixelMax.x()) { if (pixelMin.x()>pixelMax.x()) {
@ -583,12 +583,12 @@ void ewol::Widget::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
} }
if (error == true) { if (error == true) {
EWOL_ERROR("Can not set a 'min size' > 'max size' reset to maximum ..."); EWOL_ERROR("Can not set a 'min size' > 'max size' reset to maximum ...");
m_userMaxSize = gale::Dimension(vec2(ULTIMATE_MAX_SIZE,ULTIMATE_MAX_SIZE),gale::Dimension::Pixel); propertyMaxSize.get() = gale::Dimension(vec2(ULTIMATE_MAX_SIZE,ULTIMATE_MAX_SIZE),gale::Dimension::Pixel);
} }
requestUpdateSize(); requestUpdateSize();
} else if (_paramPointer == m_userMinSize) { } else if (_paramPointer == propertyMinSize) {
vec2 pixelMin = m_userMinSize->getPixel(); vec2 pixelMin = propertyMinSize->getPixel();
vec2 pixelMax = m_userMaxSize->getPixel(); vec2 pixelMax = propertyMaxSize->getPixel();
// check minimum & maximum compatibility : // check minimum & maximum compatibility :
bool error=false; bool error=false;
if (pixelMin.x()>pixelMax.x()) { if (pixelMin.x()>pixelMax.x()) {
@ -599,16 +599,16 @@ void ewol::Widget::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
} }
if (error == true) { if (error == true) {
EWOL_ERROR("Can not set a 'min size' > 'max size' set nothing ..."); EWOL_ERROR("Can not set a 'min size' > 'max size' set nothing ...");
m_userMinSize = gale::Dimension(vec2(0,0),gale::Dimension::Pixel); propertyMinSize = gale::Dimension(vec2(0,0),gale::Dimension::Pixel);
} }
requestUpdateSize(); requestUpdateSize();
} else if (_paramPointer == m_annimationTypeStart) { } else if (_paramPointer == propertyAnnimationTypeStart) {
} else if (_paramPointer == m_annimationTimeStart) { } else if (_paramPointer == propertyAnnimationTimeStart) {
} else if (_paramPointer == m_annimationTypeStop) { } else if (_paramPointer == propertyAnnimationTypeStop) {
} else if (_paramPointer == m_annimationTimeStop) { } else if (_paramPointer == propertyAnnimationTimeStop) {
} }
} }
@ -650,17 +650,17 @@ void ewol::Widget::addAnnimationType(enum ewol::Widget::annimationMode _mode, co
void ewol::Widget::setAnnimationType(enum ewol::Widget::annimationMode _mode, const std::string& _type) { void ewol::Widget::setAnnimationType(enum ewol::Widget::annimationMode _mode, const std::string& _type) {
if (_mode == 0) { if (_mode == 0) {
m_annimationTypeStart.setString(_type); propertyAnnimationTypeStart.setString(_type);
} else { } else {
m_annimationTypeStop.setString(_type); propertyAnnimationTypeStop.setString(_type);
} }
} }
void ewol::Widget::setAnnimationTime(enum ewol::Widget::annimationMode _mode, float _time) { void ewol::Widget::setAnnimationTime(enum ewol::Widget::annimationMode _mode, float _time) {
if (_mode == 0) { if (_mode == 0) {
m_annimationTimeStart.set(_time); propertyAnnimationTimeStart.set(_time);
} else { } else {
m_annimationTimeStop.set(_time); propertyAnnimationTimeStop.set(_time);
} }
} }

144
ewol/widget/Widget.h
View File

@ -69,6 +69,16 @@ namespace ewol {
* *
*/ */
class Widget : public ewol::Object { class Widget : public ewol::Object {
public: // signals:
public: // properties:
eproperty::Value<gale::Dimension> propertyMinSize; //!< user define the minimum size of the widget
eproperty::Value<gale::Dimension> propertyMaxSize; //!< user define the maximum size of the widget
eproperty::Value<bvec2> propertyExpand; //!< the widget will expand if possible
eproperty::Value<bvec2> propertyFill; //!< the widget will fill all the space provided by the parrent.
eproperty::Value<bool> propertyHide; //!< hide a widget on the display
eproperty::List<enum ewol::gravity> propertyGravity; //!< Gravity of the widget
eproperty::Value<bool> propertyCanFocus; //!< the focus can be done on this widget
protected: protected:
/** /**
* @brief Constructor of the widget classes * @brief Constructor of the widget classes
@ -183,27 +193,11 @@ namespace ewol {
* @return coordonate of the origin requested * @return coordonate of the origin requested
*/ */
virtual vec2 getOrigin(); virtual vec2 getOrigin();
protected:
eproperty::Value<gale::Dimension> m_userMinSize; //!< user define the minimum size of the widget
public: public:
/**
* @brief User set the minimum size he want to set the display
* @param[in] _size set minimum size (none : 0)
*/
void setMinSize(const gale::Dimension& _size) {
m_userMinSize.set(_size);
}
/** /**
* @brief User set No minimum size. * @brief User set No minimum size.
*/ */
void setNoMinSize(); void setNoMinSize(); // TODO : Remove ==> default ... of the property
/**
* @brief get the current calculated min size
* @return the size requested
*/
const gale::Dimension& getMinSize() {
return m_userMinSize.get();
};
/** /**
* @brief Check if the current min size is compatible with the user minimum size * @brief Check if the current min size is compatible with the user minimum size
* If it is not the user minimum size will overWrite the minimum size set. * If it is not the user minimum size will overWrite the minimum size set.
@ -211,124 +205,38 @@ namespace ewol {
*/ */
virtual void checkMinSize(); virtual void checkMinSize();
protected: protected:
eproperty::Value<gale::Dimension> m_userMaxSize; //!< user define the maximum size of the widget
public: public:
/**
* @brief User set the maximum size he want to set the display
* @param[in] _size The new maximum size requested (vec2(0,0) to unset)
*/
void setMaxSize(const gale::Dimension& _size) {
m_userMaxSize.set(_size);
}
/** /**
* @brief User set No maximum size. * @brief User set No maximum size.
*/ */
void setNoMaxSize(); void setNoMaxSize(); // TODO : Remove ==> default ... of the property
/**
* @brief get the current maximum size
* @return the size requested
*/
const gale::Dimension& getMaxSize() {
return m_userMaxSize.get();
};
/** /**
* @brief Check if the current max size is compatible with the user maximum size * @brief Check if the current max size is compatible with the user maximum size
* If it is not the user maximum size will overWrite the maximum size set. * If it is not the user maximum size will overWrite the maximum size set.
* @note : INTERNAL EWOL SYSTEM * @note : INTERNAL EWOL SYSTEM
*/ */
virtual void checkMaxSize(); virtual void checkMaxSize();
protected:
eproperty::Value<bvec2> m_userExpand;
public: public:
/**
* @brief set the expend capabilities (x&y)
* @param[in] _newExpend 2D boolean repensent the capacity to expend
*/
virtual void setExpand(const bvec2& _newExpand) {
m_userExpand.set(_newExpand);
}
/**
* @brief get the expend capabilities (x&y) (set by the user)
* @return 2D boolean repensent the capacity to expend
*/
virtual bvec2 getExpand() {
return m_userExpand;
};
/** /**
* @brief get the expend capabilities (x&y) * @brief get the expend capabilities (x&y)
* @return 2D boolean repensent the capacity to expend * @return 2D boolean repensent the capacity to expend
* @note : INTERNAL EWOL SYSTEM * @note : INTERNAL EWOL SYSTEM
*/ */
virtual bvec2 canExpand(); virtual bvec2 canExpand();
protected:
eproperty::Value<bvec2> m_userFill;
public: public:
/**
* @brief set the x&y filling capacity
* @param[in] _newFill new x&y fill state
*/
virtual void setFill(const bvec2& _newFill) {
m_userFill.set(_newFill);
}
/**
* @brief set the x&y filling capacity set by the user
* @return bvec2 repensent the capacity to x&y filling (set by the user)
*/
virtual const bvec2& getFill() {
return m_userFill;
};
/** /**
* @brief get the filling capabilities x&y * @brief get the filling capabilities x&y
* @return bvec2 repensent the capacity to x&y filling * @return bvec2 repensent the capacity to x&y filling
* @note : INTERNAL EWOL SYSTEM * @note : INTERNAL EWOL SYSTEM
*/ */
const bvec2& canFill(); const bvec2& canFill();
protected:
eproperty::Value<bool> m_hide; //!< hide a widget on the display
public:
/**
* @brief set the widget hidden
*/
virtual void hide() {
m_hide.set(true);
}
/**
* @brief set the widget visible
*/
virtual void show() {
m_hide.set(false);
}
/**
* @brief get the visibility of the widget
* @return true: if the widget is hiden, false: it is visible
*/
virtual bool isHide() {
return m_hide;
};
protected:
eproperty::List<enum ewol::gravity> m_gravity; //!< Gravity of the widget
public:
/**
* @brief set the widget gravity
* @param[in] _gravity New gravity of the widget
*/
virtual void setGravity(enum ewol::gravity _gravity) {
m_gravity.set(_gravity);
}
/**
* @brief get the widget gravity
* @return the gravity type
*/
virtual enum ewol::gravity getGravity() {
return m_gravity;
};
// ---------------------------------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------------------------------
// -- focus Area // -- focus Area
// ---------------------------------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------------------------------
private: private:
bool m_hasFocus; //!< set the focus on this widget bool m_hasFocus; //!< set the focus on this widget
eproperty::Value<bool> m_canFocus; //!< the focus can be done on this widget
public: public:
/** /**
* @brief get the focus state of the widget * @brief get the focus state of the widget
@ -337,13 +245,6 @@ namespace ewol {
virtual bool getFocus() { virtual bool getFocus() {
return m_hasFocus; return m_hasFocus;
}; };
/**
* @brief get the capability to have focus
* @return State capability to have focus
*/
virtual bool canHaveFocus() {
return m_canFocus;
};
/** /**
* @brief set focus on this widget * @brief set focus on this widget
* @return return true if the widget keep the focus * @return return true if the widget keep the focus
@ -354,13 +255,6 @@ namespace ewol {
* @return return true if the widget have release his focus (if he has it) * @return return true if the widget have release his focus (if he has it)
*/ */
virtual bool rmFocus(); virtual bool rmFocus();
/**
* @brief set the capability to have the focus
* @param[in] _canFocusState new focus capability
*/
virtual void setCanHaveFocus(bool _canFocusState) {
m_canFocus.set(_canFocusState);
}
/** /**
* @brief keep the focus on this widget == > this remove the previous focus on all other widget * @brief keep the focus on this widget == > this remove the previous focus on all other widget
*/ */
@ -455,7 +349,7 @@ namespace ewol {
* @note : INTERNAL EWOL SYSTEM * @note : INTERNAL EWOL SYSTEM
*/ */
virtual std::shared_ptr<ewol::Widget> getWidgetAtPos(const vec2& _pos) { virtual std::shared_ptr<ewol::Widget> getWidgetAtPos(const vec2& _pos) {
if (false == isHide()) { if (propertyHide.get() == false) {
return std::dynamic_pointer_cast<ewol::Widget>(shared_from_this()); return std::dynamic_pointer_cast<ewol::Widget>(shared_from_this());
} }
return nullptr; return nullptr;
@ -652,10 +546,10 @@ namespace ewol {
enum annimationMode m_annimationMode; //!< true when the annimation is started enum annimationMode m_annimationMode; //!< true when the annimation is started
float m_annimationratio; //!< Ratio of the annimation [0..1] float m_annimationratio; //!< Ratio of the annimation [0..1]
protected: protected:
eproperty::List<int32_t> m_annimationTypeStart; //!< type of start annimation eproperty::List<int32_t> propertyAnnimationTypeStart; //!< type of start annimation
eproperty::Range<float> m_annimationTimeStart; //!< time to produce start annimation eproperty::Range<float> propertyAnnimationTimeStart; //!< time to produce start annimation
eproperty::List<int32_t> m_annimationTypeStop; //!< type of start annimation eproperty::List<int32_t> propertyAnnimationTypeStop; //!< type of start annimation
eproperty::Range<float> m_annimationTimeStop; //!< time to produce start annimation eproperty::Range<float> propertyAnnimationTimeStop; //!< time to produce start annimation
protected: protected:
/** /**
* @brief Add a annimation type capabilities of this widget. * @brief Add a annimation type capabilities of this widget.

27
ewol/widget/WidgetScrolled.cpp
View File

@ -16,6 +16,8 @@
ewol::widget::WidgetScrolled::WidgetScrolled() : ewol::widget::WidgetScrolled::WidgetScrolled() :
propertyShapeVert(*this, "shape-vert", "", "shape for the vertical display"),
propertyShapeHori(*this, "shape-hori", "", "shape for the horizonal display"),
m_shaperH(), m_shaperH(),
m_shaperV(), m_shaperV(),
m_singleFingerMode(true) { m_singleFingerMode(true) {
@ -36,8 +38,8 @@ ewol::widget::WidgetScrolled::WidgetScrolled() :
void ewol::widget::WidgetScrolled::init(const std::string& _shaperName) { void ewol::widget::WidgetScrolled::init(const std::string& _shaperName) {
ewol::Widget::init(); ewol::Widget::init();
m_shaperH.setSource(_shaperName); propertyShapeVert.set(_shaperName);
m_shaperV.setSource(_shaperName); propertyShapeHori.set(_shaperName);
} }
ewol::widget::WidgetScrolled::~WidgetScrolled() { ewol::widget::WidgetScrolled::~WidgetScrolled() {
@ -225,8 +227,8 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
} else if ( m_highSpeedMode == ewol::widget::Scroll::speedModeInit } else if ( m_highSpeedMode == ewol::widget::Scroll::speedModeInit
&& _event.getStatus() == gale::key::status_move) { && _event.getStatus() == gale::key::status_move) {
// wait that the cursor move more than 10 px to enable it : // wait that the cursor move more than 10 px to enable it :
if( abs(relativePos.x() - m_highSpeedStartPos.x()) > 10 if( std::abs(relativePos.x() - m_highSpeedStartPos.x()) > 10
|| abs(relativePos.y() - m_highSpeedStartPos.y()) > 10 ) { || std::abs(relativePos.y() - m_highSpeedStartPos.y()) > 10 ) {
// the scrooling can start : // the scrooling can start :
// select the direction : // select the direction :
if (relativePos.x() == m_highSpeedStartPos.x()) { if (relativePos.x() == m_highSpeedStartPos.x()) {
@ -235,7 +237,7 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
m_highSpeedMode = ewol::widget::Scroll::speedModeEnableHorizontal; m_highSpeedMode = ewol::widget::Scroll::speedModeEnableHorizontal;
} else { } else {
float coef = (relativePos.y() - m_highSpeedStartPos.y()) / (relativePos.x() - m_highSpeedStartPos.x()); float coef = (relativePos.y() - m_highSpeedStartPos.y()) / (relativePos.x() - m_highSpeedStartPos.x());
if (abs(coef) <= 1 ) { if (std::abs(coef) <= 1 ) {
m_highSpeedMode = ewol::widget::Scroll::speedModeEnableHorizontal; m_highSpeedMode = ewol::widget::Scroll::speedModeEnableHorizontal;
} else { } else {
m_highSpeedMode = ewol::widget::Scroll::speedModeEnableVertical; m_highSpeedMode = ewol::widget::Scroll::speedModeEnableVertical;
@ -334,8 +336,8 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
} else if ( m_highSpeedMode == ewol::widget::Scroll::speedModeInit } else if ( m_highSpeedMode == ewol::widget::Scroll::speedModeInit
&& _event.getStatus() == gale::key::status_move) { && _event.getStatus() == gale::key::status_move) {
// wait that the cursor move more than 10 px to enable it : // wait that the cursor move more than 10 px to enable it :
if( abs(relativePos.x() - m_highSpeedStartPos.x()) > 10 if( std::abs(relativePos.x() - m_highSpeedStartPos.x()) > 10
|| abs(relativePos.y() - m_highSpeedStartPos.y()) > 10 ) { || std::abs(relativePos.y() - m_highSpeedStartPos.y()) > 10 ) {
// the scrooling can start : // the scrooling can start :
// select the direction : // select the direction :
m_highSpeedMode = ewol::widget::Scroll::speedModeEnableFinger; m_highSpeedMode = ewol::widget::Scroll::speedModeEnableFinger;
@ -475,3 +477,14 @@ void ewol::widget::WidgetScrolled::setSingleFinger(bool _status) {
} }
m_singleFingerMode = _status; m_singleFingerMode = _status;
} }
void ewol::widget::WidgetScrolled::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::Widget::onPropertyChangeValue(_paramPointer);
if (_paramPointer == propertyShapeVert) {
m_shaperV.setSource(propertyShapeVert);
markToRedraw();
} else if (_paramPointer == propertyShapeHori) {
m_shaperH.setSource(propertyShapeHori);
markToRedraw();
}
}

5
ewol/widget/WidgetScrolled.h
View File

@ -21,6 +21,10 @@ namespace ewol {
* @brief Widget to integrate a scrool bar in a widget. This is not a stadalone widget. * @brief Widget to integrate a scrool bar in a widget. This is not a stadalone widget.
*/ */
class WidgetScrolled : public ewol::Widget { class WidgetScrolled : public ewol::Widget {
public: // properties:
eproperty::Value<std::string> propertyShapeVert; //!< Vertical shaper name
eproperty::Value<std::string> propertyShapeHori; //!< Horizontal shaper name
// TODO : All property
public: public:
enum scrollingMode { enum scrollingMode {
scroolModeNormal, //!< No Zoom , can UP and down, left and right scroolModeNormal, //!< No Zoom , can UP and down, left and right
@ -114,6 +118,7 @@ namespace ewol {
void setLimitScrolling(float _poucentageLimit) { void setLimitScrolling(float _poucentageLimit) {
m_limitScrolling = std::avg(0.1f, _poucentageLimit,0.9f); m_limitScrolling = std::avg(0.1f, _poucentageLimit,0.9f);
}; };
void onPropertyChangeValue(const eproperty::Ref& _paramPointer);
}; };
} }
} }

8
ewol/widget/Windows.cpp
View File

@ -28,7 +28,6 @@ ewol::widget::Windows::Windows() :
m_colorProperty(nullptr), m_colorProperty(nullptr),
m_colorBg(-1) { m_colorBg(-1) {
addObjectType("ewol::widget::Windows"); addObjectType("ewol::widget::Windows");
setCanHaveFocus(true);
m_colorProperty = ewol::resource::ColorFile::create("{ewol}THEME:COLOR:Windows.json"); m_colorProperty = ewol::resource::ColorFile::create("{ewol}THEME:COLOR:Windows.json");
if (m_colorProperty != nullptr) { if (m_colorProperty != nullptr) {
m_colorBg = m_colorProperty->request("background"); m_colorBg = m_colorProperty->request("background");
@ -36,6 +35,11 @@ ewol::widget::Windows::Windows() :
//KeyboardShow(KEYBOARD_MODE_CODE); //KeyboardShow(KEYBOARD_MODE_CODE);
} }
void ewol::widget::Windows::init() {
ewol::Widget::init();
propertyCanFocus.set(true);
}
ewol::widget::Windows::~Windows() { ewol::widget::Windows::~Windows() {
m_subWidget.reset(); m_subWidget.reset();
m_popUpWidgetList.clear(); m_popUpWidgetList.clear();
@ -234,7 +238,7 @@ void ewol::widget::Windows::createPopUpMessage(enum popUpMessageType _type, cons
} }
tmpPopUp->setComment(_message); tmpPopUp->setComment(_message);
tmpPopUp->addButton("close", true); tmpPopUp->addButton("close", true);
tmpPopUp->setRemoveOnExternClick(true); tmpPopUp->propertyCloseOutEvent.set(true);
popUpWidgetPush(tmpPopUp); popUpWidgetPush(tmpPopUp);
} }

4
ewol/widget/Windows.h
View File

@ -25,9 +25,7 @@ namespace ewol {
int32_t m_colorBg; //!< Default background color of the windows int32_t m_colorBg; //!< Default background color of the windows
protected: protected:
Windows(); Windows();
void init() { void init();
ewol::Widget::init();
};
public: public:
virtual ~Windows(); virtual ~Windows();
// internal event at ewol system : // internal event at ewol system :

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

@ -26,16 +26,17 @@ static const char * const eventColorBarHasChange = "event-color-bar-has
ewol::widget::ColorChooser::ColorChooser() : ewol::widget::ColorChooser::ColorChooser() :
signalChange(*this, "change") { signalChange(*this, "change"),
propertyValue(*this, "value", etk::color::white, "color to select") {
addObjectType("ewol::widget::ColorChooser"); addObjectType("ewol::widget::ColorChooser");
} }
void ewol::widget::ColorChooser::init() { void ewol::widget::ColorChooser::init() {
ewol::widget::Sizer::init(ewol::widget::Sizer::modeVert); ewol::widget::Sizer::init(ewol::widget::Sizer::modeVert);
lockExpand(bvec2(true,true)); propertyLockExpand.set(bvec2(true,true));
m_widgetColorBar = ewol::widget::ColorBar::create(); m_widgetColorBar = ewol::widget::ColorBar::create();
m_widgetColorBar->signalChange.bind(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChange); m_widgetColorBar->signalChange.bind(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChange);
m_widgetColorBar->setFill(bvec2(true,true)); m_widgetColorBar->propertyFill.set(bvec2(true,true));
subWidgetAdd(m_widgetColorBar); subWidgetAdd(m_widgetColorBar);
etk::Color<> sliderColor; etk::Color<> sliderColor;
@ -43,40 +44,38 @@ void ewol::widget::ColorChooser::init() {
m_widgetRed = ewol::widget::Slider::create(); m_widgetRed = ewol::widget::Slider::create();
m_widgetRed->signalChange.bind(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChangeRed); m_widgetRed->signalChange.bind(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChangeRed);
m_widgetRed->setExpand(bvec2(true,false)); m_widgetRed->propertyExpand.set(bvec2(true,false));
m_widgetRed->setFill(bvec2(true,false)); m_widgetRed->propertyFill.set(bvec2(true,false));
m_widgetRed->setMin(0); m_widgetRed->propertyMinimum.set(0);
m_widgetRed->setMax(255); m_widgetRed->propertyMaximum.set(255);
sliderColor = etk::Color<>(0xFF, 0x00, 0x00, 0xFF); sliderColor = etk::Color<>(0xFF, 0x00, 0x00, 0xFF);
m_widgetRed->setColor(sliderColor); m_widgetRed->setColor(sliderColor);
subWidgetAdd(m_widgetRed); subWidgetAdd(m_widgetRed);
m_widgetGreen = ewol::widget::Slider::create(); m_widgetGreen = ewol::widget::Slider::create();
m_widgetGreen->signalChange.bind(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChangeGreen); m_widgetGreen->signalChange.bind(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChangeGreen);
m_widgetGreen->setExpand(bvec2(true,false)); m_widgetGreen->propertyExpand.set(bvec2(true,false));
m_widgetGreen->setFill(bvec2(true,false)); m_widgetGreen->propertyFill.set(bvec2(true,false));
m_widgetGreen->setMin(0); m_widgetGreen->propertyMinimum.set(0);
m_widgetGreen->propertyMaximum.set(255);
sliderColor = etk::Color<>(0x00, 0xFF, 0x00, 0xFF); sliderColor = etk::Color<>(0x00, 0xFF, 0x00, 0xFF);
m_widgetGreen->setColor(sliderColor); m_widgetGreen->setColor(sliderColor);
m_widgetGreen->setMax(255);
subWidgetAdd(m_widgetGreen); subWidgetAdd(m_widgetGreen);
m_widgetBlue = ewol::widget::Slider::create(); m_widgetBlue = ewol::widget::Slider::create();
m_widgetBlue->signalChange.bind(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChangeBlue); m_widgetBlue->signalChange.bind(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChangeBlue);
m_widgetBlue->setExpand(bvec2(true,false)); m_widgetBlue->propertyExpand.set(bvec2(true,false));
m_widgetBlue->setFill(bvec2(true,false)); m_widgetBlue->propertyFill.set(bvec2(true,false));
m_widgetBlue->setMin(0); m_widgetBlue->propertyMinimum.set(0);
m_widgetBlue->propertyMaximum.set(255);
sliderColor = etk::Color<>(0x00, 0x00, 0xFF, 0xFF); sliderColor = etk::Color<>(0x00, 0x00, 0xFF, 0xFF);
m_widgetBlue->setColor(sliderColor); m_widgetBlue->setColor(sliderColor);
m_widgetBlue->setMax(255);
subWidgetAdd(m_widgetBlue); subWidgetAdd(m_widgetBlue);
m_widgetAlpha = ewol::widget::Slider::create(); m_widgetAlpha = ewol::widget::Slider::create();
m_widgetAlpha->signalChange.bind(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChangeAlpha); m_widgetAlpha->signalChange.bind(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChangeAlpha);
m_widgetAlpha->setExpand(bvec2(true,false)); m_widgetAlpha->propertyExpand.set(bvec2(true,false));
m_widgetAlpha->setFill(bvec2(true,false)); m_widgetAlpha->propertyFill.set(bvec2(true,false));
m_widgetAlpha->setMin(0); m_widgetAlpha->propertyMinimum.set(0);
m_widgetAlpha->setMax(255); m_widgetAlpha->propertyMaximum.set(255);
subWidgetAdd(m_widgetAlpha); subWidgetAdd(m_widgetAlpha);
m_currentColor = etk::color::white;
} }
@ -85,75 +84,75 @@ ewol::widget::ColorChooser::~ColorChooser() {
} }
void ewol::widget::ColorChooser::setColor(etk::Color<> _newColor) { void ewol::widget::ColorChooser::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
m_currentColor = _newColor; ewol::widget::Sizer::onPropertyChangeValue(_paramPointer);
if (nullptr != m_widgetRed) { if (_paramPointer == propertyValue) {
m_widgetRed->setValue(m_currentColor.r()); if (m_widgetRed != nullptr) {
m_widgetRed->propertyValue.set(propertyValue->r());
}
if (m_widgetGreen != nullptr) {
m_widgetGreen->propertyValue.set(propertyValue->g());
}
if (m_widgetBlue != nullptr) {
m_widgetBlue->propertyValue.set(propertyValue->b());
}
if (m_widgetAlpha != nullptr) {
m_widgetAlpha->propertyValue.set(propertyValue->a());
}
if (m_widgetColorBar != nullptr) {
m_widgetColorBar->propertyValue.set(propertyValue);
}
} }
if (nullptr != m_widgetGreen) {
m_widgetGreen->setValue(m_currentColor.g());
}
if (nullptr != m_widgetBlue) {
m_widgetBlue->setValue(m_currentColor.b());
}
if (nullptr != m_widgetAlpha) {
m_widgetAlpha->setValue(m_currentColor.a());
}
if (nullptr != m_widgetColorBar) {
m_widgetColorBar->setCurrentColor(m_currentColor);
}
}
etk::Color<> ewol::widget::ColorChooser::getColor() {
return m_currentColor;
} }
void ewol::widget::ColorChooser::onCallbackColorChangeRed(const float& _newColor) { void ewol::widget::ColorChooser::onCallbackColorChangeRed(const float& _newColor) {
m_currentColor.setR(_newColor); propertyValue.get().setR(_newColor);
if (nullptr != m_widgetColorBar) { if (m_widgetColorBar != nullptr) {
m_widgetColorBar->setCurrentColor(m_currentColor); m_widgetColorBar->propertyValue.set(propertyValue);
} }
signalChange.emit(m_currentColor); signalChange.emit(propertyValue);
} }
void ewol::widget::ColorChooser::onCallbackColorChangeGreen(const float& _newColor) { void ewol::widget::ColorChooser::onCallbackColorChangeGreen(const float& _newColor) {
m_currentColor.setG(_newColor); propertyValue.get().setG(_newColor);
if (nullptr != m_widgetColorBar) { if (m_widgetColorBar != nullptr) {
m_widgetColorBar->setCurrentColor(m_currentColor); m_widgetColorBar->propertyValue.set(propertyValue);
} }
signalChange.emit(m_currentColor); signalChange.emit(propertyValue);
} }
void ewol::widget::ColorChooser::onCallbackColorChangeBlue(const float& _newColor) { void ewol::widget::ColorChooser::onCallbackColorChangeBlue(const float& _newColor) {
m_currentColor.setB(_newColor); propertyValue.get().setB(_newColor);
if (nullptr != m_widgetColorBar) { if (m_widgetColorBar != nullptr) {
m_widgetColorBar->setCurrentColor(m_currentColor); m_widgetColorBar->propertyValue.set(propertyValue);
} }
signalChange.emit(m_currentColor); signalChange.emit(propertyValue);
} }
void ewol::widget::ColorChooser::onCallbackColorChangeAlpha(const float& _newColor) { void ewol::widget::ColorChooser::onCallbackColorChangeAlpha(const float& _newColor) {
m_currentColor.setA(_newColor); propertyValue.get().setA(_newColor);
if (nullptr != m_widgetColorBar) { if (m_widgetColorBar != nullptr) {
m_widgetColorBar->setCurrentColor(m_currentColor); m_widgetColorBar->propertyValue.set(propertyValue);
} }
signalChange.emit(m_currentColor); signalChange.emit(propertyValue);
} }
void ewol::widget::ColorChooser::onCallbackColorChange(const etk::Color<>& _newColor) { void ewol::widget::ColorChooser::onCallbackColorChange(const etk::Color<>& _newColor) {
m_currentColor = _newColor;
// == > colorBar has change ... // == > colorBar has change ...
uint8_t tmpAlpha = m_currentColor.a(); uint8_t tmpAlpha = propertyValue->a();
m_currentColor = _newColor; propertyValue.get() = _newColor;
m_currentColor.setA(tmpAlpha); propertyValue.get().setA(tmpAlpha);
if (nullptr != m_widgetRed) { if (m_widgetRed != nullptr) {
m_widgetRed->setValue(m_currentColor.r()); m_widgetRed->propertyValue.set(propertyValue->r());
} }
if (nullptr != m_widgetGreen) { if (m_widgetGreen != nullptr) {
m_widgetGreen->setValue(m_currentColor.g()); m_widgetGreen->propertyValue.set(propertyValue->g());
} }
if (nullptr != m_widgetBlue) { if (m_widgetBlue != nullptr) {
m_widgetBlue->setValue(m_currentColor.b()); m_widgetBlue->propertyValue.set(propertyValue->b());
} }
if (nullptr != m_widgetAlpha) { if (m_widgetAlpha != nullptr) {
m_widgetAlpha->setValue(m_currentColor.a()); m_widgetAlpha->propertyValue.set(propertyValue->a());
} }
signalChange.emit(m_currentColor); signalChange.emit(propertyValue);
} }

7
ewol/widget/meta/ColorChooser.h
View File

@ -26,27 +26,26 @@ namespace ewol {
class ColorChooser : public ewol::widget::Sizer { class ColorChooser : public ewol::widget::Sizer {
public: // signals public: // signals
esignal::Signal<etk::Color<>> signalChange; esignal::Signal<etk::Color<>> signalChange;
public:
eproperty::Value<etk::Color<>> propertyValue;
protected: protected:
ColorChooser(); ColorChooser();
void init(); void init();
public: public:
DECLARE_WIDGET_FACTORY(ColorChooser, "ColorChooser"); DECLARE_WIDGET_FACTORY(ColorChooser, "ColorChooser");
virtual ~ColorChooser(); virtual ~ColorChooser();
public:
void setColor(etk::Color<> _newColor);
etk::Color<> getColor();
private: private:
std::shared_ptr<ewol::widget::ColorBar> m_widgetColorBar; std::shared_ptr<ewol::widget::ColorBar> m_widgetColorBar;
std::shared_ptr<ewol::widget::Slider> m_widgetRed; std::shared_ptr<ewol::widget::Slider> m_widgetRed;
std::shared_ptr<ewol::widget::Slider> m_widgetGreen; std::shared_ptr<ewol::widget::Slider> m_widgetGreen;
std::shared_ptr<ewol::widget::Slider> m_widgetBlue; std::shared_ptr<ewol::widget::Slider> m_widgetBlue;
std::shared_ptr<ewol::widget::Slider> m_widgetAlpha; std::shared_ptr<ewol::widget::Slider> m_widgetAlpha;
etk::Color<> m_currentColor;
void onCallbackColorChangeRed(const float& _newColor); void onCallbackColorChangeRed(const float& _newColor);
void onCallbackColorChangeGreen(const float& _newColor); void onCallbackColorChangeGreen(const float& _newColor);
void onCallbackColorChangeBlue(const float& _newColor); void onCallbackColorChangeBlue(const float& _newColor);
void onCallbackColorChangeAlpha(const float& _newColor); void onCallbackColorChangeAlpha(const float& _newColor);
void onCallbackColorChange(const etk::Color<>& _newColor); void onCallbackColorChange(const etk::Color<>& _newColor);
virtual void onPropertyChangeValue(const eproperty::Ref& _paramPointer);
}; };
}; };
}; };

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

@ -33,34 +33,38 @@ extern "C" {
#undef __class__ #undef __class__
#define __class__ "FileChooser" #define __class__ "FileChooser"
ewol::widget::FileChooser::FileChooser() : ewol::widget::FileChooser::FileChooser() :
signalCancel(*this, "cancel"), signalCancel(*this, "cancel"),
signalValidate(*this, "validate") { signalValidate(*this, "validate"),
propertyPath(*this, "path", etk::getUserHomeFolder(), ""),
propertyFile(*this, "file", "", ""),
propertyLabelTitle(*this, "title", "TRANSLATE:FileChooser", ""),
propertyLabelValidate(*this, "label-validate", "TRANSLATE:Validate", ""),
propertyLabelCancel(*this, "label-cancel", "TRANSLATE:Cancel", "") {
addObjectType("ewol::widget::FileChooser"); addObjectType("ewol::widget::FileChooser");
} }
void ewol::widget::FileChooser::init() { void ewol::widget::FileChooser::init() {
ewol::widget::Composer::init(); ewol::widget::Composer::init();
m_folder = etk::getUserHomeFolder();
m_file = "";
std::string myDescription = std::string("") std::string myDescription = std::string("")
+ "<popup >\n" + "<popup >\n"
+ " <sizer mode='vert' lock='true' fill='true' expand='true'>\n" + " <sizer mode='vert' lock='true' fill='true' expand='true'>\n"
+ " <sizer mode='hori'>\n" + " <sizer mode='hori'>\n"
+ " <checkbox name='[" + etk::to_string(getId()) + "]file-shooser:show-hiden-file'>\n" + " <checkbox name='[" + etk::to_string(getId()) + "]file-shooser:show-hiden-file'>\n"
+ " <label>" + TRANSLATE("ShowHiddenFiles") + "</label>\n" + " <label>" + TRANSLATE("TRANSLATE:ShowHiddenFiles") + "</label>\n"
+ " </checkbox>\n" + " </checkbox>\n"
+ " <spacer expand='true,false'/>\n" + " <spacer expand='true,false'/>\n"
+ " <button name='[" + etk::to_string(getId()) + "]file-shooser:button-validate'>\n" + " <button name='[" + etk::to_string(getId()) + "]file-shooser:button-validate'>\n"
+ " <sizer mode='hori'>\n" + " <sizer mode='hori'>\n"
+ " <image src='{ewol}THEME:GUI:Load.edf' fill='true' size='7,7mm' distance-field='true'/>\n" + " <image src='{ewol}THEME:GUI:Load.edf' fill='true' size='7,7mm' distance-field='true'/>\n"
+ " <label name='[" + etk::to_string(getId()) + "]file-shooser:validate-label'>" + TRANSLATE("Validate") + "</label>\n" + " <label name='[" + etk::to_string(getId()) + "]file-shooser:validate-label'>" + TRANSLATE(propertyLabelValidate) + "</label>\n"
+ " </sizer>\n" + " </sizer>\n"
+ " </button>\n" + " </button>\n"
+ " <button name='[" + etk::to_string(getId()) + "]file-shooser:button-cancel'>\n" + " <button name='[" + etk::to_string(getId()) + "]file-shooser:button-cancel'>\n"
+ " <sizer mode='hori'>\n" + " <sizer mode='hori'>\n"
+ " <image src='{ewol}THEME:GUI:Remove.edf' fill='true' size='7,7mm' distance-field='true'/>\n" + " <image src='{ewol}THEME:GUI:Remove.edf' fill='true' size='7,7mm' distance-field='true'/>\n"
+ " <label name='[" + etk::to_string(getId()) + "]file-shooser:cancel-label'>" + TRANSLATE("Cancel") + "</label>\n" + " <label name='[" + etk::to_string(getId()) + "]file-shooser:cancel-label'>" + TRANSLATE(propertyLabelCancel) + "</label>\n"
+ " </sizer>\n" + " </sizer>\n"
+ " </button>\n" + " </button>\n"
+ " </sizer>\n" + " </sizer>\n"
@ -91,7 +95,7 @@ void ewol::widget::FileChooser::init() {
+ " <entry name='[" + etk::to_string(getId()) + "]file-shooser:entry-folder' expand='true,false' fill='true,false'/>\n" + " <entry name='[" + etk::to_string(getId()) + "]file-shooser:entry-folder' expand='true,false' fill='true,false'/>\n"
+ " <image name='[" + etk::to_string(getId()) + "]file-shooser:img-home' src='{ewol}THEME:GUI:Home.edf' expand='false' size='8,8mm' distance-field='true'/>\n" + " <image name='[" + etk::to_string(getId()) + "]file-shooser:img-home' src='{ewol}THEME:GUI:Home.edf' expand='false' size='8,8mm' distance-field='true'/>\n"
+ " </sizer>\n" + " </sizer>\n"
+ " <label name='[" + etk::to_string(getId()) + "]file-shooser:title-label'>" + TRANSLATE("FileChooser") + "</label>\n" + " <label name='[" + etk::to_string(getId()) + "]file-shooser:title-label'>" + TRANSLATE(propertyLabelTitle) + "</label>\n"
+ " </sizer>\n" + " </sizer>\n"
+ "</popup>"; + "</popup>";
loadFromString(myDescription); loadFromString(myDescription);
@ -108,7 +112,7 @@ void ewol::widget::FileChooser::init() {
subBind(ewol::widget::Image, "[" + etk::to_string(getId()) + "]file-shooser:img-home", signalPressed, shared_from_this(), &ewol::widget::FileChooser::onCallbackHomePressed); subBind(ewol::widget::Image, "[" + etk::to_string(getId()) + "]file-shooser:img-home", signalPressed, shared_from_this(), &ewol::widget::FileChooser::onCallbackHomePressed);
// set the default Folder properties: // set the default Folder properties:
updateCurrentFolder(); updateCurrentFolder();
setCanHaveFocus(true); propertyCanFocus.set(true);
} }
void ewol::widget::FileChooser::onGetFocus() { void ewol::widget::FileChooser::onGetFocus() {
@ -120,29 +124,23 @@ ewol::widget::FileChooser::~FileChooser() {
} }
void ewol::widget::FileChooser::setTitle(const std::string& _label) { void ewol::widget::FileChooser::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
propertySetOnWidgetNamed("[" + etk::to_string(getId()) + "]file-shooser:title-label", "value", _label); ewol::widget::Composer::onPropertyChangeValue(_paramPointer);
if (_paramPointer == propertyPath) {
propertyPath.get() += "/";
updateCurrentFolder();
} else if (_paramPointer == propertyFile) {
propertySetOnWidgetNamed("[" + etk::to_string(getId()) + "]file-shooser:entry-file", "value", propertyFile);
updateCurrentFolder();
} else if (_paramPointer == propertyLabelTitle) {
propertySetOnWidgetNamed("[" + etk::to_string(getId()) + "]file-shooser:title-label", "value", TRANSLATE(propertyLabelTitle));
} else if (_paramPointer == propertyLabelValidate) {
propertySetOnWidgetNamed("[" + etk::to_string(getId()) + "]file-shooser:validate-label", "value", TRANSLATE(propertyLabelValidate));
} else if (_paramPointer == propertyLabelCancel) {
propertySetOnWidgetNamed("[" + etk::to_string(getId()) + "]file-shooser:cancel-label", "value", TRANSLATE(propertyLabelCancel));
}
} }
void ewol::widget::FileChooser::setValidateLabel(const std::string& _label) {
propertySetOnWidgetNamed("[" + etk::to_string(getId()) + "]file-shooser:validate-label", "value", _label);
}
void ewol::widget::FileChooser::setCancelLabel(const std::string& _label) {
propertySetOnWidgetNamed("[" + etk::to_string(getId()) + "]file-shooser:cancel-label", "value", _label);
}
void ewol::widget::FileChooser::setFolder(const std::string& _folder) {
m_folder = _folder + "/";
updateCurrentFolder();
}
void ewol::widget::FileChooser::setFileName(const std::string& _filename) {
m_file = _filename;
propertySetOnWidgetNamed("[" + etk::to_string(getId()) + "]file-shooser:entry-file", "value", _filename);
}
void ewol::widget::FileChooser::onCallbackEntryFolderChangeValue(const std::string& _value) { void ewol::widget::FileChooser::onCallbackEntryFolderChangeValue(const std::string& _value) {
// == > change the folder name // == > change the folder name
// TODO : change the folder, if it exit ... // TODO : change the folder, if it exit ...
@ -150,9 +148,9 @@ void ewol::widget::FileChooser::onCallbackEntryFolderChangeValue(const std::stri
void ewol::widget::FileChooser::onCallbackEntryFileChangeValue(const std::string& _value) { void ewol::widget::FileChooser::onCallbackEntryFileChangeValue(const std::string& _value) {
// == > change the file name // == > change the file name
m_file = _value; propertyFile.get() = _value;
// update the selected file in the list : // update the selected file in the list :
propertySetOnWidgetNamed("[" + etk::to_string(getId()) + "]file-shooser:list-files", "select", m_file); propertySetOnWidgetNamed("[" + etk::to_string(getId()) + "]file-shooser:list-files", "select", propertyFile);
} }
void ewol::widget::FileChooser::onCallbackButtonCancelPressed() { void ewol::widget::FileChooser::onCallbackButtonCancelPressed() {
@ -173,16 +171,16 @@ void ewol::widget::FileChooser::onCallbackHidenFileChangeChangeValue(const bool&
void ewol::widget::FileChooser::onCallbackListFolderSelectChange(const std::string& _value) { void ewol::widget::FileChooser::onCallbackListFolderSelectChange(const std::string& _value) {
// == > this is an internal event ... // == > this is an internal event ...
EWOL_DEBUG(" old PATH : \"" << m_folder << "\" + \"" << _value << "\""); EWOL_DEBUG(" old PATH: '" << propertyPath << "' + '" << _value << "'");
m_folder = m_folder + _value; propertyPath.get() += _value;
EWOL_DEBUG("new PATH : \"" << m_folder << "\""); EWOL_DEBUG("new PATH: '" << propertyPath << "'");
m_folder = etk::simplifyPath(m_folder); propertyPath.get() = etk::simplifyPath(propertyPath);
setFileName(""); propertyFile.set("");
updateCurrentFolder(); updateCurrentFolder();
} }
void ewol::widget::FileChooser::onCallbackListFileSelectChange(const std::string& _value) { void ewol::widget::FileChooser::onCallbackListFileSelectChange(const std::string& _value) {
setFileName(_value); propertyFile.set(_value);
/* /*
std::string tmpFileCompleatName = m_folder; std::string tmpFileCompleatName = m_folder;
tmpFileCompleatName += m_file; tmpFileCompleatName += m_file;
@ -192,18 +190,18 @@ void ewol::widget::FileChooser::onCallbackListFileSelectChange(const std::string
void ewol::widget::FileChooser::onCallbackListFileValidate(const std::string& _value) { void ewol::widget::FileChooser::onCallbackListFileValidate(const std::string& _value) {
// select the file == > generate a validate // select the file == > generate a validate
setFileName(_value); propertyFile.set(_value);
EWOL_VERBOSE(" generate a fiel opening : '" << m_folder << "' / '" << m_file << "'"); EWOL_VERBOSE(" generate a fiel opening : '" << propertyPath << "' / '" << propertyFile << "'");
signalValidate.emit(getCompleateFileName()); signalValidate.emit(getCompleateFileName());
autoDestroy(); autoDestroy();
} }
void ewol::widget::FileChooser::onCallbackListValidate() { void ewol::widget::FileChooser::onCallbackListValidate() {
if (m_file == "" ) { if (propertyFile.get() == "") {
EWOL_WARNING(" Validate : '" << m_folder << "' / '" << m_file << "' ==> error No name ..."); EWOL_WARNING(" Validate : '" << propertyPath << "' / '" << propertyFile << "' ==> error No name ...");
return; return;
} }
EWOL_DEBUG(" generate a file opening : '" << m_folder << "' / '" << m_file << "'"); EWOL_DEBUG(" generate a file opening : '" << propertyPath << "' / '" << propertyFile << "'");
signalValidate.emit(getCompleateFileName()); signalValidate.emit(getCompleateFileName());
autoDestroy(); autoDestroy();
} }
@ -212,28 +210,28 @@ void ewol::widget::FileChooser::onCallbackHomePressed() {
std::string tmpUserFolder = etk::getUserHomeFolder(); std::string tmpUserFolder = etk::getUserHomeFolder();
EWOL_DEBUG("new PATH : \"" << tmpUserFolder << "\""); EWOL_DEBUG("new PATH : \"" << tmpUserFolder << "\"");
m_folder = etk::simplifyPath(tmpUserFolder); propertyPath.get() = etk::simplifyPath(tmpUserFolder);
setFileName(""); propertyFile.set("");
updateCurrentFolder(); updateCurrentFolder();
} }
void ewol::widget::FileChooser::updateCurrentFolder() { void ewol::widget::FileChooser::updateCurrentFolder() {
if (m_folder != "" ) { if (propertyPath.get() != "") {
if (m_folder[m_folder.size()-1] != '/') { if (propertyPath.get()[propertyPath->size()-1] != '/') {
m_folder += "/"; propertyPath.get() += "/";
} }
} }
propertySetOnWidgetNamed("[" + etk::to_string(getId()) + "]file-shooser:list-files", "path", m_folder); propertySetOnWidgetNamed("[" + etk::to_string(getId()) + "]file-shooser:list-files", "path", propertyPath);
propertySetOnWidgetNamed("[" + etk::to_string(getId()) + "]file-shooser:list-folder", "path", m_folder); propertySetOnWidgetNamed("[" + etk::to_string(getId()) + "]file-shooser:list-folder", "path", propertyPath);
propertySetOnWidgetNamed("[" + etk::to_string(getId()) + "]file-shooser:entry-folder", "value", m_folder); propertySetOnWidgetNamed("[" + etk::to_string(getId()) + "]file-shooser:entry-folder", "value", propertyPath);
markToRedraw(); markToRedraw();
} }
std::string ewol::widget::FileChooser::getCompleateFileName() { std::string ewol::widget::FileChooser::getCompleateFileName() {
std::string tmpString = m_folder; std::string tmpString = propertyPath;
tmpString += "/"; tmpString += "/";
tmpString += m_file; tmpString += propertyFile;
etk::FSNode node(tmpString); etk::FSNode node(tmpString);
return node.getName(); return node.getName();
} }

15
ewol/widget/meta/FileChooser.h
View File

@ -66,6 +66,12 @@ namespace ewol {
public: // signals public: // signals
esignal::Signal<void> signalCancel; esignal::Signal<void> signalCancel;
esignal::Signal<std::string> signalValidate; esignal::Signal<std::string> signalValidate;
public: // properties
eproperty::Value<std::string> propertyPath;
eproperty::Value<std::string> propertyFile;
eproperty::Value<std::string> propertyLabelTitle;
eproperty::Value<std::string> propertyLabelValidate;
eproperty::Value<std::string> propertyLabelCancel;
protected: protected:
FileChooser(); FileChooser();
void init(); void init();
@ -73,14 +79,6 @@ namespace ewol {
DECLARE_WIDGET_FACTORY(FileChooser, "FileChooser"); DECLARE_WIDGET_FACTORY(FileChooser, "FileChooser");
virtual ~FileChooser(); virtual ~FileChooser();
private: private:
std::string m_folder;
std::string m_file;
public:
void setTitle(const std::string& _label);
void setValidateLabel(const std::string& _label);
void setCancelLabel(const std::string& _label);
void setFolder(const std::string& _folder);
void setFileName(const std::string& _filename);
std::string getCompleateFileName(); std::string getCompleateFileName();
void updateCurrentFolder(); void updateCurrentFolder();
public: // Derived function public: // Derived function
@ -96,6 +94,7 @@ namespace ewol {
void onCallbackListFileValidate(const std::string& _value); void onCallbackListFileValidate(const std::string& _value);
void onCallbackListValidate(); void onCallbackListValidate();
void onCallbackHomePressed(); void onCallbackHomePressed();
virtual void onPropertyChangeValue(const eproperty::Ref& _paramPointer);
}; };
}; };
}; };

88
ewol/widget/meta/Parameter.cpp
View File

@ -23,6 +23,7 @@
ewol::widget::Parameter::Parameter() : ewol::widget::Parameter::Parameter() :
signalClose(*this, "close"), signalClose(*this, "close"),
propertyLabelTitle(*this, "title", "TRANSLATE:Parameter", ""),
m_currentIdList(0), m_currentIdList(0),
m_widgetTitle(), m_widgetTitle(),
m_paramList() { m_paramList() {
@ -36,37 +37,37 @@ void ewol::widget::Parameter::init() {
std::shared_ptr<ewol::widget::Sizer> mySizerHori = nullptr; std::shared_ptr<ewol::widget::Sizer> mySizerHori = nullptr;
std::shared_ptr<ewol::widget::Spacer> mySpacer = nullptr; std::shared_ptr<ewol::widget::Spacer> mySpacer = nullptr;
#ifdef __TARGET_OS__Android #ifdef __TARGET_OS__Android
setMinSize(gale::Dimension(vec2(90, 90), gale::Dimension::Pourcent)); propertyMinSize.set(gale::Dimension(vec2(90, 90), gale::Dimension::Pourcent));
#else #else
setMinSize(gale::Dimension(vec2(80, 80), gale::Dimension::Pourcent)); propertyMinSize.set(gale::Dimension(vec2(80, 80), gale::Dimension::Pourcent));
#endif #endif
mySizerVert = ewol::widget::Sizer::create(widget::Sizer::modeVert); mySizerVert = ewol::widget::Sizer::create(widget::Sizer::modeVert);
if (nullptr == mySizerVert) { if (mySizerVert == nullptr) {
EWOL_ERROR("Can not allocate widget == > display might be in error"); EWOL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
EWOL_INFO("add widget"); EWOL_INFO("add widget");
mySizerVert->lockExpand(bvec2(true,true)); mySizerVert->propertyLockExpand.set(bvec2(true,true));
mySizerVert->setExpand(bvec2(true,true)); mySizerVert->propertyExpand.set(bvec2(true,true));
// set it in the pop-up-system : // set it in the pop-up-system :
setSubWidget(mySizerVert); setSubWidget(mySizerVert);
mySizerHori = ewol::widget::Sizer::create(widget::Sizer::modeHori); mySizerHori = ewol::widget::Sizer::create(widget::Sizer::modeHori);
if (nullptr == mySizerHori) { if (mySizerHori == nullptr) {
EWOL_ERROR("Can not allocate widget == > display might be in error"); EWOL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
mySizerVert->subWidgetAdd(mySizerHori); mySizerVert->subWidgetAdd(mySizerHori);
mySpacer = ewol::widget::Spacer::create(); mySpacer = ewol::widget::Spacer::create();
if (nullptr == mySpacer) { if (mySpacer == nullptr) {
EWOL_ERROR("Can not allocate widget == > display might be in error"); EWOL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
mySpacer->setExpand(bvec2(true,false)); mySpacer->propertyExpand.set(bvec2(true,false));
mySizerHori->subWidgetAdd(mySpacer); mySizerHori->subWidgetAdd(mySpacer);
} }
std::shared_ptr<ewol::widget::Button> tmpButton = widget::Button::create(); std::shared_ptr<ewol::widget::Button> tmpButton = widget::Button::create();
if (nullptr == tmpButton) { if (tmpButton == nullptr) {
EWOL_ERROR("Can not allocate widget == > display might be in error"); EWOL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
tmpButton->setSubWidget(ewol::widget::Composer::create(widget::Composer::String, tmpButton->setSubWidget(ewol::widget::Composer::create(widget::Composer::String,
@ -81,16 +82,16 @@ void ewol::widget::Parameter::init() {
} }
mySpacer = ewol::widget::Spacer::create(); mySpacer = ewol::widget::Spacer::create();
if (nullptr == mySpacer) { if (mySpacer == nullptr) {
EWOL_ERROR("Can not allocate widget == > display might be in error"); EWOL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
mySpacer->setExpand(bvec2(false,false)); mySpacer->propertyExpand.set(bvec2(false,false));
mySpacer->setMinSize(gale::Dimension(vec2(10,0))); mySpacer->propertyMinSize.set(gale::Dimension(vec2(10,0)));
mySizerHori->subWidgetAdd(mySpacer); mySizerHori->subWidgetAdd(mySpacer);
} }
tmpButton = ewol::widget::Button::create(); tmpButton = ewol::widget::Button::create();
if (nullptr == tmpButton) { if (tmpButton == nullptr) {
EWOL_ERROR("Can not allocate widget == > display might be in error"); EWOL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
tmpButton->setSubWidget(ewol::widget::Composer::create(widget::Composer::String, tmpButton->setSubWidget(ewol::widget::Composer::create(widget::Composer::String,
@ -106,74 +107,74 @@ void ewol::widget::Parameter::init() {
} }
mySizerHori = ewol::widget::Sizer::create(widget::Sizer::modeHori); mySizerHori = ewol::widget::Sizer::create(widget::Sizer::modeHori);
if (nullptr == mySizerHori) { if (mySizerHori == nullptr) {
EWOL_ERROR("Can not allocate widget == > display might be in error"); EWOL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
mySizerVert->subWidgetAdd(mySizerHori); mySizerVert->subWidgetAdd(mySizerHori);
m_paramList = ewol::widget::ParameterList::create(); m_paramList = ewol::widget::ParameterList::create();
if (nullptr == m_paramList) { if (m_paramList == nullptr) {
EWOL_ERROR("Can not allocate widget == > display might be in error"); EWOL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
m_paramList->signalSelect.bind(shared_from_this(), &ewol::widget::Parameter::onCallbackMenuSelected); m_paramList->signalSelect.bind(shared_from_this(), &ewol::widget::Parameter::onCallbackMenuSelected);
m_paramList->setFill(bvec2(false,true)); m_paramList->propertyFill.set(bvec2(false,true));
m_paramList->setExpand(bvec2(false,true)); m_paramList->propertyExpand.set(bvec2(false,true));
mySizerHori->subWidgetAdd(m_paramList); mySizerHori->subWidgetAdd(m_paramList);
} }
mySpacer = ewol::widget::Spacer::create(); mySpacer = ewol::widget::Spacer::create();
if (nullptr == mySpacer) { if (mySpacer == nullptr) {
EWOL_ERROR("Can not allocate widget == > display might be in error"); EWOL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
mySpacer->setFill(bvec2(false,true)); mySpacer->propertyFill.set(bvec2(false,true));
mySpacer->setMinSize(vec2(5,5)); mySpacer->propertyMinSize.set(vec2(5,5));
mySpacer->setColor(0x000000BF); mySpacer->propertyColor.set(0x000000BF);
mySizerHori->subWidgetAdd(mySpacer); mySizerHori->subWidgetAdd(mySpacer);
} }
std::shared_ptr<ewol::widget::Sizer> mySizerVert2 = widget::Sizer::create(widget::Sizer::modeVert); std::shared_ptr<ewol::widget::Sizer> mySizerVert2 = widget::Sizer::create(widget::Sizer::modeVert);
if (nullptr == mySizerVert2) { if (mySizerVert2 == nullptr) {
EWOL_ERROR("Can not allocate widget == > display might be in error"); EWOL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
mySizerHori->subWidgetAdd(mySizerVert2); mySizerHori->subWidgetAdd(mySizerVert2);
mySpacer = ewol::widget::Spacer::create(); mySpacer = ewol::widget::Spacer::create();
if (nullptr == mySpacer) { if (mySpacer == nullptr) {
EWOL_ERROR("Can not allocate widget == > display might be in error"); EWOL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
mySpacer->setExpand(bvec2(true,false)); mySpacer->propertyExpand.set(bvec2(true,false));
mySpacer->setMinSize(vec2(5,5)); mySpacer->propertyMinSize.set(vec2(5,5));
mySpacer->setColor(0x000000BF); mySpacer->propertyColor.set(0x000000BF);
mySizerVert2->subWidgetAdd(mySpacer); mySizerVert2->subWidgetAdd(mySpacer);
} }
m_wSlider = ewol::widget::WSlider::create(); m_wSlider = ewol::widget::WSlider::create();
if (nullptr == m_wSlider) { if (m_wSlider == nullptr) {
EWOL_ERROR("Can not allocate widget == > display might be in error"); EWOL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
m_wSlider->setTransitionSpeed(0.5); m_wSlider->propertyTransitionSpeed.set(0.5);
m_wSlider->setTransitionMode(ewol::widget::WSlider::sladingTransitionVert); m_wSlider->propertyTransitionMode.set(ewol::widget::WSlider::sladingTransitionVert);
m_wSlider->setExpand(bvec2(true,true)); m_wSlider->propertyExpand.set(bvec2(true,true));
mySizerVert2->subWidgetAdd(m_wSlider); mySizerVert2->subWidgetAdd(m_wSlider);
} }
} }
} }
mySpacer = ewol::widget::Spacer::create(); mySpacer = ewol::widget::Spacer::create();
if (nullptr == mySpacer) { if (mySpacer == nullptr) {
EWOL_ERROR("Can not allocate widget == > display might be in error"); EWOL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
mySpacer->setExpand(bvec2(true,false)); mySpacer->propertyExpand.set(bvec2(true,false));
mySpacer->setMinSize(vec2(5,5)); mySpacer->propertyMinSize.set(vec2(5,5));
mySpacer->setColor(0x000000BF); mySpacer->propertyColor.set(0x000000BF);
mySizerVert->subWidgetAdd(mySpacer); mySizerVert->subWidgetAdd(mySpacer);
} }
m_widgetTitle = ewol::widget::Label::create("File chooser ..."); m_widgetTitle = ewol::widget::Label::create(TRANSLATE(propertyLabelTitle));
if (nullptr == m_widgetTitle) { if (m_widgetTitle == nullptr) {
EWOL_ERROR("Can not allocate widget == > display might be in error"); EWOL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
m_widgetTitle->setExpand(bvec2(true,false)); m_widgetTitle->propertyExpand.set(bvec2(true,false));
mySizerVert->subWidgetAdd(m_widgetTitle); mySizerVert->subWidgetAdd(m_widgetTitle);
} }
} }
@ -183,12 +184,13 @@ void ewol::widget::Parameter::init() {
ewol::widget::Parameter::~Parameter() { ewol::widget::Parameter::~Parameter() {
} }
void ewol::widget::Parameter::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
void ewol::widget::Parameter::setTitle(std::string _label) { ewol::widget::PopUp::onPropertyChangeValue(_paramPointer);
if (nullptr == m_widgetTitle) { if (_paramPointer == propertyLabelTitle) {
return; if (m_widgetTitle != nullptr) {
m_widgetTitle->propertyValue.set(TRANSLATE(propertyLabelTitle));
}
} }
m_widgetTitle->setLabel(_label);
} }
void ewol::widget::Parameter::onCallbackMenuclosed() { void ewol::widget::Parameter::onCallbackMenuclosed() {
@ -220,7 +222,7 @@ void ewol::widget::Parameter::menuAdd(std::string _label, std::string _image, st
if (nullptr == myLabel) { if (nullptr == myLabel) {
EWOL_ERROR("Can not allocate widget == > display might be in error"); EWOL_ERROR("Can not allocate widget == > display might be in error");
} else { } else {
myLabel->setExpand(bvec2(true,true)); myLabel->propertyExpand.set(bvec2(true,true));
m_wSlider->subWidgetAdd(myLabel); m_wSlider->subWidgetAdd(myLabel);
} }
} }

4
ewol/widget/meta/Parameter.h
View File

@ -27,6 +27,8 @@ namespace ewol {
class Parameter : public ewol::widget::PopUp { class Parameter : public ewol::widget::PopUp {
public: // signals public: // signals
esignal::Signal<void> signalClose; esignal::Signal<void> signalClose;
public: // properties
eproperty::Value<std::string> propertyLabelTitle;
protected: protected:
Parameter(); Parameter();
void init(); void init();
@ -34,7 +36,6 @@ namespace ewol {
DECLARE_WIDGET_FACTORY(Parameter, "Parameter"); DECLARE_WIDGET_FACTORY(Parameter, "Parameter");
virtual ~Parameter(); virtual ~Parameter();
public: public:
void setTitle(std::string _label);
void menuAdd(std::string _label, std::string _image, std::shared_ptr<ewol::Widget> _associateWidget); void menuAdd(std::string _label, std::string _image, std::shared_ptr<ewol::Widget> _associateWidget);
void menuAddGroup(std::string _label); void menuAddGroup(std::string _label);
void menuClear(); void menuClear();
@ -48,6 +49,7 @@ namespace ewol {
void onCallbackMenuclosed(); void onCallbackMenuclosed();
void onCallbackParameterSave(); void onCallbackParameterSave();
void onCallbackMenuSelected(const int32_t& _value); void onCallbackMenuSelected(const int32_t& _value);
virtual void onPropertyChangeValue(const eproperty::Ref& _paramPointer);
}; };
}; };
}; };

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

@ -30,11 +30,11 @@ ewol::widget::ParameterList::ParameterList() :
#else #else
m_paddingSizeY = 2; m_paddingSizeY = 2;
#endif #endif
setCanHaveFocus(true);
} }
void ewol::widget::ParameterList::init() { void ewol::widget::ParameterList::init() {
ewol::widget::WidgetScrolled::init(); ewol::widget::WidgetScrolled::init();
propertyCanFocus.set(true);
} }
ewol::widget::ParameterList::~ParameterList() { ewol::widget::ParameterList::~ParameterList() {
//clean all the object //clean all the object

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

@ -19,35 +19,29 @@ void ewol::widget::SpinBase::init(ewol::widget::Manager& _widgetManager) {
} }
ewol::widget::SpinBase::SpinBase() : ewol::widget::SpinBase::SpinBase() :
propertyShape(*this, "shape", "", "shape for the display"),
propertySpinMode(*this, "mode", ewol::widget::spinPosition_RightRight, "The display spin mode"),
m_confIdEntryShaper(-1), m_confIdEntryShaper(-1),
m_confIdUpShaper(-1), m_confIdUpShaper(-1),
m_confIdDownShaper(-1), m_confIdDownShaper(-1),
m_confIdUpData(-1), m_confIdUpData(-1),
m_confIdDownData(-1), m_confIdDownData(-1) {
m_spinMode(*this, "mode", ewol::widget::spinPosition_RightRight, "The display spin mode") {
addObjectType("ewol::widget::SpinBase"); addObjectType("ewol::widget::SpinBase");
m_spinMode.add(ewol::widget::spinPosition_noneNone, "none-none"); propertySpinMode.add(ewol::widget::spinPosition_noneNone, "none-none");
m_spinMode.add(ewol::widget::spinPosition_noneRight, "none-right"); propertySpinMode.add(ewol::widget::spinPosition_noneRight, "none-right");
m_spinMode.add(ewol::widget::spinPosition_leftNone, "left-none"); propertySpinMode.add(ewol::widget::spinPosition_leftNone, "left-none");
m_spinMode.add(ewol::widget::spinPosition_leftRight, "left-right"); propertySpinMode.add(ewol::widget::spinPosition_leftRight, "left-right");
m_spinMode.add(ewol::widget::spinPosition_leftLeft, "left-left"); propertySpinMode.add(ewol::widget::spinPosition_leftLeft, "left-left");
m_spinMode.add(ewol::widget::spinPosition_RightRight, "right-right"); propertySpinMode.add(ewol::widget::spinPosition_RightRight, "right-right");
} }
void ewol::widget::SpinBase::init(enum ewol::widget::spinPosition _mode, void ewol::widget::SpinBase::init(enum ewol::widget::spinPosition _mode,
const std::string& _shaperName) { const std::string& _shaperName) {
ewol::widget::Sizer::init(ewol::widget::Sizer::modeHori); ewol::widget::Sizer::init(ewol::widget::Sizer::modeHori);
lockExpand(bvec2(true,true)); propertyLockExpand.set(bvec2(true,true));
m_config = ewol::resource::ConfigFile::create(_shaperName); propertyShape.set(_shaperName);
if (m_config != nullptr) { propertySpinMode = _mode;
m_confIdEntryShaper = m_config->request("entry-shaper"); propertyGravity.set(gravity_center);
m_confIdUpShaper = m_config->request("up-shaper");
m_confIdDownShaper = m_config->request("down-shaper");
m_confIdUpData = m_config->request("up-data");
m_confIdDownData = m_config->request("down-data");
}
m_spinMode = _mode;
setGravity(gravity_center);
updateGui(); updateGui();
} }
@ -57,8 +51,18 @@ ewol::widget::SpinBase::~SpinBase() {
void ewol::widget::SpinBase::onPropertyChangeValue(const eproperty::Ref& _paramPointer) { void ewol::widget::SpinBase::onPropertyChangeValue(const eproperty::Ref& _paramPointer) {
ewol::widget::Sizer::onPropertyChangeValue(_paramPointer); ewol::widget::Sizer::onPropertyChangeValue(_paramPointer);
if (_paramPointer == m_spinMode) { if (_paramPointer == propertySpinMode) {
updateGui(); updateGui();
} else if (_paramPointer == propertyShape) {
m_config = ewol::resource::ConfigFile::create(propertyShape);
if (m_config != nullptr) {
m_confIdEntryShaper = m_config->request("entry-shaper");
m_confIdUpShaper = m_config->request("up-shaper");
m_confIdDownShaper = m_config->request("down-shaper");
m_confIdUpData = m_config->request("up-data");
m_confIdDownData = m_config->request("down-data");
}
markToRedraw();
} }
} }
@ -77,8 +81,8 @@ void ewol::widget::SpinBase::updateGui() {
} }
m_widgetEntry = ewol::widget::Entry::create("", shaper); m_widgetEntry = ewol::widget::Entry::create("", shaper);
if (m_widgetEntry != nullptr) { if (m_widgetEntry != nullptr) {
m_widgetEntry->setExpand(bvec2(true,false)); m_widgetEntry->propertyExpand.set(bvec2(true,false));
m_widgetEntry->setFill(bvec2(true,true)); m_widgetEntry->propertyFill.set(bvec2(true,true));
} }
} }
if (m_widgetButtonDown == nullptr) { if (m_widgetButtonDown == nullptr) {
@ -89,8 +93,8 @@ void ewol::widget::SpinBase::updateGui() {
} }
m_widgetButtonDown = ewol::widget::Button::create(shaper); m_widgetButtonDown = ewol::widget::Button::create(shaper);
if (m_widgetButtonDown != nullptr) { if (m_widgetButtonDown != nullptr) {
m_widgetButtonDown->setExpand(bvec2(false,false)); m_widgetButtonDown->propertyExpand.set(bvec2(false,false));
m_widgetButtonDown->setFill(bvec2(true,true)); m_widgetButtonDown->propertyFill.set(bvec2(true,true));
std::string data = m_config->getString(m_confIdDownData); std::string data = m_config->getString(m_confIdDownData);
std::shared_ptr<ewol::Widget> widget = ewol::widget::composerGenerate(ewol::widget::Composer::String, data); std::shared_ptr<ewol::Widget> widget = ewol::widget::composerGenerate(ewol::widget::Composer::String, data);
m_widgetButtonDown->setSubWidget(widget); m_widgetButtonDown->setSubWidget(widget);
@ -104,15 +108,15 @@ void ewol::widget::SpinBase::updateGui() {
} }
m_widgetButtonUp = ewol::widget::Button::create(shaper); m_widgetButtonUp = ewol::widget::Button::create(shaper);
if (m_widgetButtonUp != nullptr) { if (m_widgetButtonUp != nullptr) {
m_widgetButtonUp->setExpand(bvec2(false,false)); m_widgetButtonUp->propertyExpand.set(bvec2(false,false));
m_widgetButtonUp->setFill(bvec2(true,true)); m_widgetButtonUp->propertyFill.set(bvec2(true,true));
std::string data = m_config->getString(m_confIdUpData); std::string data = m_config->getString(m_confIdUpData);
std::shared_ptr<ewol::Widget> widget = ewol::widget::composerGenerate(ewol::widget::Composer::String, data); std::shared_ptr<ewol::Widget> widget = ewol::widget::composerGenerate(ewol::widget::Composer::String, data);
m_widgetButtonUp->setSubWidget(widget); m_widgetButtonUp->setSubWidget(widget);
} }
} }
EWOL_INFO("add ...."); EWOL_INFO("add ....");
switch (m_spinMode) { switch (propertySpinMode) {
case ewol::widget::spinPosition_noneNone: case ewol::widget::spinPosition_noneNone:
EWOL_INFO("add Entry"); EWOL_INFO("add Entry");
subWidgetAdd(m_widgetEntry); subWidgetAdd(m_widgetEntry);

3
ewol/widget/meta/SpinBase.h
View File

@ -62,7 +62,8 @@ namespace ewol {
*/ */
class SpinBase : public ewol::widget::Sizer { class SpinBase : public ewol::widget::Sizer {
public: // properties list: public: // properties list:
eproperty::List<enum ewol::widget::spinPosition> m_spinMode; //!< How to display the spin base eproperty::Value<std::string> propertyShape; //!< Shape of the widget
eproperty::List<enum ewol::widget::spinPosition> propertySpinMode; //!< How to display the spin base
public: public:
/** /**
* @brief Main call of recording the widget on the List of "widget named creator" * @brief Main call of recording the widget on the List of "widget named creator"

38
ewol/widget/meta/StdPopUp.cpp
View File

@ -21,11 +21,11 @@ ewol::widget::StdPopUp::StdPopUp() :
m_comment(nullptr), m_comment(nullptr),
m_subBar(nullptr) { m_subBar(nullptr) {
addObjectType("ewol::widget::StdPopUp"); addObjectType("ewol::widget::StdPopUp");
setMinSize(gale::Dimension(vec2(20,10),gale::Dimension::Pourcent));
} }
void ewol::widget::StdPopUp::init() { void ewol::widget::StdPopUp::init() {
ewol::widget::PopUp::init(); ewol::widget::PopUp::init();
propertyMinSize.set(gale::Dimension(vec2(20,10),gale::Dimension::Pourcent));
std::shared_ptr<ewol::widget::Sizer> mySizerVert; std::shared_ptr<ewol::widget::Sizer> mySizerVert;
std::shared_ptr<ewol::widget::Spacer> mySpacer; std::shared_ptr<ewol::widget::Spacer> mySpacer;
@ -34,42 +34,42 @@ void ewol::widget::StdPopUp::init() {
setSubWidget(mySizerVert); setSubWidget(mySizerVert);
m_subBar = ewol::widget::Sizer::create(widget::Sizer::modeHori); m_subBar = ewol::widget::Sizer::create(widget::Sizer::modeHori);
m_subBar->lockExpand(bvec2(true,true)); m_subBar->propertyLockExpand.set(bvec2(true,true));
m_subBar->setExpand(bvec2(true,false)); m_subBar->propertyExpand.set(bvec2(true,false));
mySizerVert->subWidgetAdd(m_subBar); mySizerVert->subWidgetAdd(m_subBar);
mySpacer = ewol::widget::Spacer::create(); mySpacer = ewol::widget::Spacer::create();
mySpacer->setExpand(bvec2(true,false)); mySpacer->propertyExpand.set(bvec2(true,false));
m_subBar->subWidgetAdd(mySpacer); m_subBar->subWidgetAdd(mySpacer);
mySpacer = ewol::widget::Spacer::create(); mySpacer = ewol::widget::Spacer::create();
mySpacer->setExpand(bvec2(true,false)); mySpacer->propertyExpand.set(bvec2(true,false));
mySpacer->setColor(etk::Color<>(0x88, 0x88, 0x88, 0xFF)); mySpacer->propertyColor.set(etk::Color<>(0x88, 0x88, 0x88, 0xFF));
mySpacer->setMinSize(gale::Dimension(vec2(0,3),gale::Dimension::Pixel)); mySpacer->propertyMinSize.set(gale::Dimension(vec2(0,3),gale::Dimension::Pixel));
mySizerVert->subWidgetAdd(mySpacer); mySizerVert->subWidgetAdd(mySpacer);
mySpacer = ewol::widget::Spacer::create(); mySpacer = ewol::widget::Spacer::create();
mySpacer->setExpand(bvec2(true,false)); mySpacer->propertyExpand.set(bvec2(true,false));
mySpacer->setMinSize(gale::Dimension(vec2(0,5),gale::Dimension::Pixel)); mySpacer->propertyMinSize.set(gale::Dimension(vec2(0,5),gale::Dimension::Pixel));
mySizerVert->subWidgetAdd(mySpacer); mySizerVert->subWidgetAdd(mySpacer);
m_comment = ewol::widget::Label::create("No Label"); m_comment = ewol::widget::Label::create("No Label");
m_comment->setExpand(bvec2(true,true)); m_comment->propertyExpand.set(bvec2(true,true));
mySizerVert->subWidgetAdd(m_comment); mySizerVert->subWidgetAdd(m_comment);
mySpacer = ewol::widget::Spacer::create(); mySpacer = ewol::widget::Spacer::create();
mySpacer->setExpand(bvec2(true,false)); mySpacer->propertyExpand.set(bvec2(true,false));
mySpacer->setMinSize(gale::Dimension(vec2(0,5),gale::Dimension::Pixel)); mySpacer->propertyMinSize.set(gale::Dimension(vec2(0,5),gale::Dimension::Pixel));
mySizerVert->subWidgetAdd(mySpacer); mySizerVert->subWidgetAdd(mySpacer);
mySpacer = ewol::widget::Spacer::create(); mySpacer = ewol::widget::Spacer::create();
mySpacer->setExpand(bvec2(true,false)); mySpacer->propertyExpand.set(bvec2(true,false));
mySpacer->setColor(etk::Color<>(0x88, 0x88, 0x88, 0xFF)); mySpacer->propertyColor.set(etk::Color<>(0x88, 0x88, 0x88, 0xFF));
mySpacer->setMinSize(gale::Dimension(vec2(0,3),gale::Dimension::Pixel)); mySpacer->propertyMinSize.set(gale::Dimension(vec2(0,3),gale::Dimension::Pixel));
mySizerVert->subWidgetAdd(mySpacer); mySizerVert->subWidgetAdd(mySpacer);
m_title = ewol::widget::Label::create("<bold>Message</bold>"); m_title = ewol::widget::Label::create("<bold>Message</bold>");
m_title->setExpand(bvec2(true,false)); m_title->propertyExpand.set(bvec2(true,false));
m_title->setFill(bvec2(true,true)); m_title->propertyFill.set(bvec2(true,true));
mySizerVert->subWidgetAdd(m_title); mySizerVert->subWidgetAdd(m_title);
} }
@ -81,7 +81,7 @@ void ewol::widget::StdPopUp::setTitle(const std::string& _text) {
if (m_title == nullptr) { if (m_title == nullptr) {
return; return;
} }
m_title->setLabel(_text); m_title->propertyValue.set(_text);
markToRedraw(); markToRedraw();
} }
@ -89,7 +89,7 @@ void ewol::widget::StdPopUp::setComment(const std::string& _text) {
if (m_comment == nullptr) { if (m_comment == nullptr) {
return; return;
} }
m_comment->setLabel(_text); m_comment->propertyValue.set(_text);
markToRedraw(); markToRedraw();
} }

2
ewol/widget/meta/StdPopUp.h
View File

@ -38,6 +38,8 @@ namespace ewol {
* [/pre] * [/pre]
*/ */
class StdPopUp : public ewol::widget::PopUp { class StdPopUp : public ewol::widget::PopUp {
public: // properties:
// TODO: ...
protected: protected:
/** /**
* @brief std-pop-up constructor. * @brief std-pop-up constructor.

6
lutin_ewol-tools-visual-test.py
View File

@ -31,12 +31,6 @@ def create(target, module_name):
'tools/visual_test/appl/debug.cpp', 'tools/visual_test/appl/debug.cpp',
'tools/visual_test/appl/init.cpp', 'tools/visual_test/appl/init.cpp',
'tools/visual_test/appl/MainWindows.cpp', 'tools/visual_test/appl/MainWindows.cpp',
'tools/visual_test/appl/widget/SizerColor.cpp',
'tools/visual_test/appl/TestButton.cpp',
'tools/visual_test/appl/TestCheckBox.cpp',
'tools/visual_test/appl/TestImage.cpp',
'tools/visual_test/appl/TestButtonColor.cpp',
'tools/visual_test/appl/TestLabel.cpp',
'tools/visual_test/appl/TestDistanceField.cpp' 'tools/visual_test/appl/TestDistanceField.cpp'
]) ])

47
tools/visual_test/appl/MainWindows.cpp
View File

@ -25,11 +25,6 @@
#include <ewol/widget/Select.h> #include <ewol/widget/Select.h>
#include <ewol/widget/Manager.h> #include <ewol/widget/Manager.h>
#include <ewol/context/Context.h> #include <ewol/context/Context.h>
#include <appl/TestButton.h>
#include <appl/TestCheckBox.h>
#include <appl/TestButtonColor.h>
#include <appl/TestLabel.h>
#include <appl/TestImage.h>
#include <appl/TestDistanceField.h> #include <appl/TestDistanceField.h>
#include <etk/os/FSNode.h> #include <etk/os/FSNode.h>
#include <eproperty/Value.h> #include <eproperty/Value.h>
@ -190,11 +185,11 @@ void appl::MainWindows::onCallbackWidgetChange(int32_t _increment) {
static void addSpacer(const std::shared_ptr<ewol::widget::Sizer>& _sizer, etk::Color<> _color=etk::color::none) { static void addSpacer(const std::shared_ptr<ewol::widget::Sizer>& _sizer, etk::Color<> _color=etk::color::none) {
std::shared_ptr<ewol::widget::Spacer> mySpacer = ewol::widget::Spacer::create(); std::shared_ptr<ewol::widget::Spacer> mySpacer = ewol::widget::Spacer::create();
if (mySpacer != nullptr) { if (mySpacer != nullptr) {
mySpacer->setExpand(bvec2(true,false)); mySpacer->propertyExpand.set(bvec2(true,false));
mySpacer->setFill(bvec2(true,false)); mySpacer->propertyFill.set(bvec2(true,false));
if (_color == etk::color::none) { if (_color == etk::color::none) {
mySpacer->setMinSize(vec2(3,3)); mySpacer->propertyMinSize.set(vec2(3,3));
mySpacer->setColor(_color); mySpacer->propertyColor.set(_color);
} }
_sizer->subWidgetAdd(mySpacer); _sizer->subWidgetAdd(mySpacer);
} }
@ -217,8 +212,8 @@ void appl::MainWindows::updateProperty() {
} }
std::shared_ptr<ewol::widget::Sizer> widgetSizer = ewol::widget::Sizer::create(ewol::widget::Sizer::modeHori); std::shared_ptr<ewol::widget::Sizer> widgetSizer = ewol::widget::Sizer::create(ewol::widget::Sizer::modeHori);
if (widgetSizer != nullptr) { if (widgetSizer != nullptr) {
widgetSizer->setExpand(bvec2(true,false)); widgetSizer->propertyExpand.set(bvec2(true,false));
widgetSizer->setFill(bvec2(true,true)); widgetSizer->propertyFill.set(bvec2(true,true));
m_sizerDynamic->subWidgetAddStart(widgetSizer); m_sizerDynamic->subWidgetAddStart(widgetSizer);
std::shared_ptr<ewol::widget::Label> widget = ewol::widget::Label::create(param->getName() + ":"); std::shared_ptr<ewol::widget::Label> widget = ewol::widget::Label::create(param->getName() + ":");
@ -236,9 +231,9 @@ void appl::MainWindows::updateProperty() {
return; return;
} }
std::string value = paramValue->get(); std::string value = paramValue->get();
widgetTmp->setValue(value); widgetTmp->propertyValue.set(value);
widgetTmp->setExpand(bvec2(true,false)); widgetTmp->propertyExpand.set(bvec2(true,false));
widgetTmp->setFill(bvec2(true,false)); widgetTmp->propertyFill.set(bvec2(true,false));
widgetTmp->signalModify.connect([=](const std::string& _value) { widgetTmp->signalModify.connect([=](const std::string& _value) {
APPL_INFO("set parameter : NAME name=" << param->getName() << " value=" << _value); APPL_INFO("set parameter : NAME name=" << param->getName() << " value=" << _value);
paramValue->set(_value); paramValue->set(_value);
@ -257,7 +252,7 @@ void appl::MainWindows::updateProperty() {
return; return;
} }
bvec2 value = paramValue->get(); bvec2 value = paramValue->get();
widgetTmp->setValue(value.x()); widgetTmp->propertyValue.set(value.x());
widgetTmp->signalValue.connect([=](const bool& _value) { widgetTmp->signalValue.connect([=](const bool& _value) {
APPL_INFO("set parameter : X name=" << param->getName() << " value=" << _value); APPL_INFO("set parameter : X name=" << param->getName() << " value=" << _value);
bvec2 lastValueInterpreted = paramValue->get(); bvec2 lastValueInterpreted = paramValue->get();
@ -270,7 +265,7 @@ void appl::MainWindows::updateProperty() {
widgetTmp = ewol::widget::CheckBox::create(); widgetTmp = ewol::widget::CheckBox::create();
widgetSizer->subWidgetAdd(widgetTmp); widgetSizer->subWidgetAdd(widgetTmp);
widgetTmp->setValue(value.y()); widgetTmp->propertyValue.set(value.y());
widgetTmp->signalValue.connect([=](const bool& _value) { widgetTmp->signalValue.connect([=](const bool& _value) {
APPL_INFO("set parameter : Y name=" << param->getName() << " value=" << _value); APPL_INFO("set parameter : Y name=" << param->getName() << " value=" << _value);
bvec2 lastValueInterpreted = paramValue->get(); bvec2 lastValueInterpreted = paramValue->get();
@ -311,9 +306,9 @@ void appl::MainWindows::updateProperty() {
widgetSizer->subWidgetAdd(widgetTmp); widgetSizer->subWidgetAdd(widgetTmp);
eproperty::Property* param = m_subWidget->getPropertyRaw(iii); eproperty::Property* param = m_subWidget->getPropertyRaw(iii);
std::string value = param->getString(); std::string value = param->getString();
widgetTmp->setValue(value); widgetTmp->propertyValue.set(value);
widgetTmp->setExpand(bvec2(true,false)); widgetTmp->propertyExpand.set(bvec2(true,false));
widgetTmp->setFill(bvec2(true,false)); widgetTmp->propertyFill.set(bvec2(true,false));
widgetTmp->signalModify.connect([=](const std::string& _value) { widgetTmp->signalModify.connect([=](const std::string& _value) {
APPL_INFO("set parameter : NAME name=" << param->getName() << " value=" << _value); APPL_INFO("set parameter : NAME name=" << param->getName() << " value=" << _value);
param->setString(_value); param->setString(_value);
@ -344,8 +339,8 @@ void appl::MainWindows::updateProperty() {
type = "enum ewol::gravity"; type = "enum ewol::gravity";
std::shared_ptr<ewol::widget::Select> widgetTmp = ewol::widget::Select::create(); std::shared_ptr<ewol::widget::Select> widgetTmp = ewol::widget::Select::create();
widgetSizer->subWidgetAdd(widgetTmp); widgetSizer->subWidgetAdd(widgetTmp);
widgetTmp->setExpand(bvec2(true,false)); widgetTmp->propertyExpand.set(bvec2(true,false));
widgetTmp->setFill(bvec2(true,false)); widgetTmp->propertyFill.set(bvec2(true,false));
widgetTmp->optionAdd(int32_t(ewol::gravity_center), "Center"); widgetTmp->optionAdd(int32_t(ewol::gravity_center), "Center");
widgetTmp->optionAdd(int32_t(ewol::gravity_top), "Top"); widgetTmp->optionAdd(int32_t(ewol::gravity_top), "Top");
widgetTmp->optionAdd(int32_t(ewol::gravity_buttom), "Buttom"); widgetTmp->optionAdd(int32_t(ewol::gravity_buttom), "Buttom");
@ -362,7 +357,7 @@ void appl::MainWindows::updateProperty() {
return; return;
} }
ewol::gravity value = paramValue->get(); ewol::gravity value = paramValue->get();
widgetTmp->setValue(value); widgetTmp->propertyValue.set(value);
widgetTmp->signalValue.connect([=](const int32_t& _value) { widgetTmp->signalValue.connect([=](const int32_t& _value) {
enum ewol::gravity val = ewol::gravity(_value); enum ewol::gravity val = ewol::gravity(_value);
APPL_INFO("set parameter: gravity name=" << param->getName() << " value=" << val); APPL_INFO("set parameter: gravity name=" << param->getName() << " value=" << val);
@ -373,10 +368,10 @@ void appl::MainWindows::updateProperty() {
} }
std::shared_ptr<ewol::widget::Spacer> mySpacer = ewol::widget::Spacer::create(); std::shared_ptr<ewol::widget::Spacer> mySpacer = ewol::widget::Spacer::create();
if (mySpacer != nullptr) { if (mySpacer != nullptr) {
mySpacer->setExpand(bvec2(true,false)); mySpacer->propertyExpand.set(bvec2(true,false));
mySpacer->setFill(bvec2(true,false)); mySpacer->propertyFill.set(bvec2(true,false));
mySpacer->setMinSize(vec2(3,3)); mySpacer->propertyMinSize.set(vec2(3,3));
mySpacer->setColor(etk::color::blue); mySpacer->propertyColor.set(etk::color::blue);
m_sizerDynamic->subWidgetAddStart(mySpacer); m_sizerDynamic->subWidgetAddStart(mySpacer);
} }
} }

210
tools/visual_test/appl/TestButton.cpp
View File

@ -1,210 +0,0 @@
/**
* @author Edouard DUPIN
*
* @copyright 2010, Edouard DUPIN, all right reserved
*
* @license BSD v3 (see license file)
*/
#include <appl/debug.h>
#include <appl/TestButton.h>
#include <ewol/widget/Button.h>
#include <ewol/widget/CheckBox.h>
#include <ewol/widget/Sizer.h>
#include <ewol/widget/Label.h>
#include <ewol/widget/Entry.h>
#include <ewol/widget/List.h>
#include <ewol/widget/ContextMenu.h>
#include <ewol/widget/PopUp.h>
#include <ewol/widget/Slider.h>
#include <ewol/widget/Composer.h>
#include <ewol/widget/Menu.h>
#include <ewol/widget/meta/FileChooser.h>
#include <ewol/widget/meta/Parameter.h>
#include <ewol/widget/Manager.h>
#undef __class__
#define __class__ "TestButton"
appl::TestButton::TestButton() {
addObjectType("appl::TestButton");
}
void appl::TestButton::init() {
ewol::widget::Composer::init();
APPL_INFO("Create " __class__ " (start)");
std::string myDescription = std::string("")
+ "<sizer mode='vert' fill='true' expand='true'>\n"
+ " <sizer mode='hori'>\n"
+ " <button name='[TEST]Button:Expand-x' toggle='true'>\n"
+ " <label>Expend X <br/> (false)</label>\n"
+ " <label>Expend X <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " <button name='[TEST]Button:Expand-y' toggle='true'>\n"
+ " <label>Expend Y <br/> (false)</label>\n"
+ " <label>Expend Y <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " <button name='[TEST]Button:Toggle' toggle='true'>\n"
+ " <label>Toggle <br/> (false)</label>\n"
+ " <label>Toggle <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " <button name='[TEST]Button:TextToggle' toggle='true'>\n"
+ " <label>Text On toggle state <br/> (false)</label>\n"
+ " <label>Text On toggle state <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " </sizer>\n"
+ " <sizer mode='hori'>\n"
+ " <button name='[TEST]Button:Fill-x' toggle='true'>\n"
+ " <label>Fill X <br/> (false)</label>\n"
+ " <label>Fill X <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " <button name='[TEST]Button:Fill-y' toggle='true'>\n"
+ " <label>Fill Y <br/> (false)</label>\n"
+ " <label>Fill Y <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " <button name='[TEST]Button:ChangeText'>\n"
+ " <label>Change Text<br/> and other ...</label>\n"
+ " </button>\n"
+ " </sizer>\n"
+ " <sizer mode='hori'>\n"
+ " <spacer expand='false,false' fill='true,false' min-size='10,10px' color='#F008'/>\n"
+ " <sizer mode='vert'>\n"
+ " <spacer expand='false,false' fill='false,true' min-size='10,10px' color='#FF08'/>\n"
+ " <button name='[TEST]Button:TO-TEST' expand='false,false' fill='false,false' >\n"
+ " <label>My <font color='#FF0000'>Button</font> <br/> And Some under line<br/> plop <br/> and an other super long line ...</label>\n"
+ " </button>\n"
+ " <spacer expand='false,false' fill='false,true' min-size='10,10px' color='#0FF8'/>\n"
+ " </sizer>\n"
+ " <spacer expand='false,false' fill='true,false' min-size='10,10px' color='#0F08'/>\n"
+ " </sizer>\n"
+ "</sizer>";
loadFromString(myDescription);
setExpand(bvec2(true,true));
setFill(bvec2(true,true));
subBind(ewol::widget::Button, "[TEST]Button:Expand-x", signalValue, shared_from_this(), &appl::TestButton::onCallbackExpendX);
subBind(ewol::widget::Button, "[TEST]Button:Expand-y", signalValue, shared_from_this(), &appl::TestButton::onCallbackExpendY);
subBind(ewol::widget::Button, "[TEST]Button:Toggle", signalValue, shared_from_this(), &appl::TestButton::onCallbackToggle);
subBind(ewol::widget::Button, "[TEST]Button:TextToggle", signalValue, shared_from_this(), &appl::TestButton::onCallbackTextToggle);
subBind(ewol::widget::Button, "[TEST]Button:Fill-x", signalValue, shared_from_this(), &appl::TestButton::onCallbackFillX);
subBind(ewol::widget::Button, "[TEST]Button:Fill-y", signalValue, shared_from_this(), &appl::TestButton::onCallbackFillY);
subBind(ewol::widget::Button, "[TEST]Button:ChangeText", signalPressed, shared_from_this(), &appl::TestButton::onCallbackChangeText);
m_testWidget = std::dynamic_pointer_cast<ewol::widget::Button>(getSubObjectNamed("[TEST]Button:TO-TEST"));
if (m_testWidget == nullptr) {
APPL_CRITICAL("Can not get the pointer of the widget button pointer");
}
APPL_INFO("Create " __class__ " (end)");
}
void appl::TestButton::onCallbackExpendX(const bool& _value) {
if (m_testWidget == nullptr) {
return;
}
m_testWidget->setExpand(bvec2(_value, m_testWidget->getExpand().y()));
}
void appl::TestButton::onCallbackExpendY(const bool& _value) {
if (m_testWidget == nullptr) {
return;
}
m_testWidget->setExpand(bvec2(m_testWidget->getExpand().x(), _value));
}
void appl::TestButton::onCallbackFillX(const bool& _value) {
if (m_testWidget == nullptr) {
return;
}
m_testWidget->setFill(bvec2(_value, m_testWidget->getFill().y()));
}
void appl::TestButton::onCallbackFillY(const bool& _value) {
if (m_testWidget == nullptr) {
return;
}
m_testWidget->setFill(bvec2(m_testWidget->getFill().x(), _value));
}
void appl::TestButton::onCallbackToggle(const bool& _value) {
if (m_testWidget == nullptr) {
return;
}
m_testWidget->setToggleMode(_value);
}
void appl::TestButton::onCallbackTextToggle(const bool& _value) {
if (m_testWidget == nullptr) {
return;
}
if (_value == true) {
m_testWidget->setSubWidgetToggle(ewol::widget::Label::create("A stupid very long text on toggle <br/><br/> and on multiple lines"));
} else {
m_testWidget->setSubWidgetToggle(nullptr);
}
}
void appl::TestButton::onCallbackChangeText() {
if (m_testWidget == nullptr) {
return;
}
static int32_t countTextID = 1;
switch (countTextID) {
case 0:
m_testWidget->setSubWidget(ewol::widget::Label::create("simple Text"));
break;
case 1:
m_testWidget->setSubWidget(ewol::widget::Label::create("<left>Align Left</left>"));
break;
case 2:
m_testWidget->setSubWidget(ewol::widget::Label::create("<right>Align right</right>"));
break;
case 3:
m_testWidget->setSubWidget(ewol::widget::Label::create("<center>Align center</center>"));
break;
case 4:
m_testWidget->setSubWidget(ewol::widget::Label::create("simple Text<br/> With Some Other Lines<br/> and more if you want ...<br/> plop"));
break;
case 5:
m_testWidget->setSubWidget(ewol::widget::Label::create("simple <bold>Text</bold> with bold"));
break;
case 6:
m_testWidget->setSubWidget(ewol::widget::Label::create("simple <italic>Text</italic> with italic"));
break;
case 7:
m_testWidget->setSubWidget(ewol::widget::Label::create("simple <italic><bold>Text</bold></italic> with italic bold"));
break;
case 8:
m_testWidget->setSubWidget(nullptr);
break;
case 9:
m_testWidget->setSubWidget(ewol::widget::Label::create("simple <font color=\"#FFFF0088\">Text</font> with colored text"));
break;
case 10:
m_testWidget->setSubWidget(ewol::widget::Composer::create(ewol::widget::Composer::String, "<label>ploppp</label>\n"));
break;
case 11:
m_testWidget->setSubWidget(ewol::widget::Composer::create(ewol::widget::Composer::String,
" <sizer mode=\"vert\" addmode=\"invert\">\n"
" <label>ploppp</label>\n"
" <label expand=\"true,true\"><center>** ** * *<br/>** * * * *</center></label>\n"
" </sizer>\n"));
break;
case 12:
m_testWidget->setSubWidget(ewol::widget::Composer::create(ewol::widget::Composer::String, "<spacer color='red' min-size='30,30px'/>\n"));
break;
default:
m_testWidget->setSubWidget(ewol::widget::Label::create("My <font color=\"#FF0000\">Button</font> <br/> And Some under line<br/> plop <br/> and an other super long line ..."));
countTextID=-1;
break;
}
// set at the subWidget all the space they can ...
if (m_testWidget->getSubWidget() != nullptr){
m_testWidget->getSubWidget()->setFill(bvec2(true,true));
m_testWidget->getSubWidget()->setExpand(bvec2(true,true));
}
countTextID++;
}

32
tools/visual_test/appl/TestButton.h
View File

@ -1,32 +0,0 @@
/**
* @author Edouard DUPIN
*
* @copyright 2010, Edouard DUPIN, all right reserved
*
* @license BSD v3 (see license file)
*/
#pragma once
#include <appl/debug.h>
#include <ewol/widget/Button.h>
#include <ewol/widget/Composer.h>
namespace appl {
class TestButton : public ewol::widget::Composer {
private:
std::shared_ptr<ewol::widget::Button> m_testWidget;
public:
// Constructeur
TestButton();
void init();
public:
DECLARE_FACTORY(TestButton);
protected:
void onCallbackExpendX(const bool& _value);
void onCallbackExpendY(const bool& _value);
void onCallbackFillX(const bool& _value);
void onCallbackFillY(const bool& _value);
void onCallbackToggle(const bool& _value);
void onCallbackTextToggle(const bool& _value);
void onCallbackChangeText();
};
}

125
tools/visual_test/appl/TestButtonColor.cpp
View File

@ -1,125 +0,0 @@
/**
* @author Edouard DUPIN
*
* @copyright 2010, Edouard DUPIN, all right reserved
*
* @license BSD v3 (see license file)
*/
#include <appl/debug.h>
#include <appl/TestButtonColor.h>
#include <ewol/widget/Button.h>
#include <ewol/widget/CheckBox.h>
#include <ewol/widget/Sizer.h>
#include <ewol/widget/Label.h>
#include <ewol/widget/Entry.h>
#include <ewol/widget/List.h>
#include <ewol/widget/ContextMenu.h>
#include <ewol/widget/PopUp.h>
#include <ewol/widget/Slider.h>
#include <ewol/widget/Menu.h>
#include <ewol/widget/meta/FileChooser.h>
#include <ewol/widget/meta/Parameter.h>
#include <ewol/widget/Manager.h>
static const char * l_eventChangeExpendX = "event-change-expend-X";
static const char * l_eventChangeExpendY = "event-change-expend-Y";
static const char * l_eventChangeFillX = "event-change-fill-X";
static const char * l_eventChangeFillY = "event-change-fill-Y";
#undef __class__
#define __class__ "TestButton"
appl::TestButtonColor::TestButtonColor() {
addObjectType("appl::TestButtonColor");
}
void appl::TestButtonColor::init() {
ewol::widget::Composer::init();
APPL_INFO("Create " __class__ " (start)");
std::string myDescription = std::string("")
+ "<sizer mode='vert' fill='true' expand='true'>\n"
+ " <sizer mode='hori'>\n"
+ " <button name='[TEST]Button:Expand-x' toggle='true'>\n"
+ " <label>Expend X <br/> (false)</label>\n"
+ " <label>Expend X <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " <button name='[TEST]Button:Expand-y' toggle='true'>\n"
+ " <label>Expend Y <br/> (false)</label>\n"
+ " <label>Expend Y <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " </sizer>\n"
+ " <sizer mode='hori'>\n"
+ " <button name='[TEST]Button:Fill-x' toggle='true'>\n"
+ " <label>Fill X <br/> (false)</label>\n"
+ " <label>Fill X <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " <button name='[TEST]Button:Fill-y' toggle='true'>\n"
+ " <label>Fill Y <br/> (false)</label>\n"
+ " <label>Fill Y <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " </sizer>\n"
+ " <sizer mode='hori'>\n"
+ " <spacer expand='false,false' fill='true,false' min-size='10,10px' color='#F008'/>\n"
+ " <sizer mode='vert'>\n"
+ " <spacer expand='false,false' fill='false,true' min-size='10,10px' color='#FF08'/>\n"
+ " <ButtonColor name='[TEST]TO-TEST' expand='false,false' fill='false,false' />\n"
+ " <spacer expand='false,false' fill='false,true' min-size='10,10px' color='#0FF8'/>\n"
+ " </sizer>\n"
+ " <spacer expand='false,false' fill='true,false' min-size='10,10px' color='#0F08'/>\n"
+ " </sizer>\n"
+ "</sizer>";
loadFromString(myDescription);
setExpand(bvec2(true,true));
setFill(bvec2(true,true));
subBind(ewol::widget::Button, "[TEST]Button:Expand-x", signalValue, shared_from_this(), &appl::TestButtonColor::onCallbackExpendX);
subBind(ewol::widget::Button, "[TEST]Button:Expand-y", signalValue, shared_from_this(), &appl::TestButtonColor::onCallbackExpendY);
subBind(ewol::widget::Button, "[TEST]Button:Fill-x", signalValue, shared_from_this(), &appl::TestButtonColor::onCallbackFillX);
subBind(ewol::widget::Button, "[TEST]Button:Fill-y", signalValue, shared_from_this(), &appl::TestButtonColor::onCallbackFillY);
m_testWidget = std::dynamic_pointer_cast<ewol::widget::ButtonColor>(getSubObjectNamed("[TEST]TO-TEST"));
if (m_testWidget == nullptr) {
APPL_CRITICAL("Can not get the pointer of the widget button pointer");
}
m_testWidget->signalChange.bind(shared_from_this(), &appl::TestButtonColor::onCallbackChangeColor);
APPL_INFO("Create " __class__ " (end)");
}
void appl::TestButtonColor::onCallbackExpendX(const bool& _value) {
if (m_testWidget == nullptr) {
return;
}
m_testWidget->setExpand(bvec2(_value, m_testWidget->getExpand().y()));
}
void appl::TestButtonColor::onCallbackExpendY(const bool& _value) {
if (m_testWidget == nullptr) {
return;
}
m_testWidget->setExpand(bvec2(m_testWidget->getExpand().x(), _value));
}
void appl::TestButtonColor::onCallbackFillX(const bool& _value) {
if (m_testWidget == nullptr) {
return;
}
m_testWidget->setFill(bvec2(_value, m_testWidget->getFill().y()));
}
void appl::TestButtonColor::onCallbackFillY(const bool& _value) {
if (m_testWidget == nullptr) {
return;
}
m_testWidget->setFill(bvec2(m_testWidget->getFill().x(), _value));
}
void appl::TestButtonColor::onCallbackChangeColor(const etk::Color<>& _value) {
if (m_testWidget == nullptr) {
return;
}
APPL_WARNING("Color change: " << _value);
}

36
tools/visual_test/appl/TestButtonColor.h
View File

@ -1,36 +0,0 @@
/**
* @author Edouard DUPIN
*
* @copyright 2010, Edouard DUPIN, all right reserved
*
* @license BSD v3 (see license file)
*/
#pragma once
#include <appl/debug.h>
#include <ewol/widget/Widget.h>
#include <ewol/widget/Button.h>
#include <ewol/widget/ButtonColor.h>
#include <ewol/widget/Spacer.h>
#include <ewol/widget/Composer.h>
namespace appl {
class TestButtonColor : public ewol::widget::Composer {
private:
std::shared_ptr<ewol::widget::ButtonColor> m_testWidget;
public:
// Constructeur
TestButtonColor();
void init();
public:
DECLARE_FACTORY(TestButtonColor);
virtual ~TestButtonColor() {};
protected:
void onCallbackExpendX(const bool& _value);
void onCallbackExpendY(const bool& _value);
void onCallbackFillX(const bool& _value);
void onCallbackFillY(const bool& _value);
void onCallbackChangeColor(const etk::Color<>& _value);
};
}

180
tools/visual_test/appl/TestCheckBox.cpp
View File

@ -1,180 +0,0 @@
/**
* @author Edouard DUPIN
*
* @copyright 2010, Edouard DUPIN, all right reserved
*
* @license BSD v3 (see license file)
*/
#include <appl/debug.h>
#include <appl/TestCheckBox.h>
#include <ewol/widget/Button.h>
#include <ewol/widget/CheckBox.h>
#include <ewol/widget/Sizer.h>
#include <ewol/widget/Label.h>
#include <ewol/widget/Entry.h>
#include <ewol/widget/List.h>
#include <ewol/widget/ContextMenu.h>
#include <ewol/widget/PopUp.h>
#include <ewol/widget/Slider.h>
#include <ewol/widget/Composer.h>
#include <ewol/widget/Menu.h>
#include <ewol/widget/meta/FileChooser.h>
#include <ewol/widget/meta/Parameter.h>
#include <ewol/widget/Manager.h>
#undef __class__
#define __class__ "TestCheckBox"
appl::TestCheckBox::TestCheckBox() {
addObjectType("appl::TestCheckBox");
}
void appl::TestCheckBox::init() {
ewol::widget::Composer::init();
APPL_INFO("Create " __class__ " (start)");
std::string myDescription = std::string("")
+ "<sizer mode='vert' fill='true' expand='true'>\n"
+ " <sizer mode='hori'>\n"
+ " <button name='[TEST]Button:Expand-x' toggle='true'>\n"
+ " <label>Expend X <br/> (false)</label>\n"
+ " <label>Expend X <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " <button name='[TEST]Button:Expand-y' toggle='true'>\n"
+ " <label>Expend Y <br/> (false)</label>\n"
+ " <label>Expend Y <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " <button name='[TEST]Button:TextToggle' toggle='true'>\n"
+ " <label>Text On toggle state <br/> (false)</label>\n"
+ " <label>Text On toggle state <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " </sizer>\n"
+ " <sizer mode='hori'>\n"
+ " <button name='[TEST]Button:Fill-x' toggle='true'>\n"
+ " <label>Fill X <br/> (false)</label>\n"
+ " <label>Fill X <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " <button name='[TEST]Button:Fill-y' toggle='true'>\n"
+ " <label>Fill Y <br/> (false)</label>\n"
+ " <label>Fill Y <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " <button name='[TEST]Button:ChangeText'>\n"
+ " <label>Change Text<br/> and other ...</label>\n"
+ " </button>\n"
+ " </sizer>\n"
+ " <sizer mode='hori'>\n"
+ " <spacer expand='false,false' fill='true,false' min-size='10,10px' color='#F008'/>\n"
+ " <sizer mode='vert'>\n"
+ " <spacer expand='false,false' fill='false,true' min-size='10,10px' color='#FF08'/>\n"
+ " <CheckBox name='[TEST]TO-TEST' expand='false,false' fill='false,false' >\n"
+ " <label>My <font color='#FF0000'>CheckBox</font> <br/> And Some under line<br/> plop <br/> and an other super long line ...</label>\n"
+ " </CheckBox>\n"
+ " <spacer expand='false,false' fill='false,true' min-size='10,10px' color='#0FF8'/>\n"
+ " </sizer>\n"
+ " <spacer expand='false,false' fill='true,false' min-size='10,10px' color='#0F08'/>\n"
+ " </sizer>\n"
+ "</sizer>";
loadFromString(myDescription);
setExpand(bvec2(true,true));
setFill(bvec2(true,true));
subBind(ewol::widget::Button, "[TEST]Button:Expand-x", signalValue, shared_from_this(), &appl::TestCheckBox::onCallbackExpendX);
subBind(ewol::widget::Button, "[TEST]Button:Expand-y", signalValue, shared_from_this(), &appl::TestCheckBox::onCallbackExpendY);
subBind(ewol::widget::Button, "[TEST]Button:Fill-x", signalValue, shared_from_this(), &appl::TestCheckBox::onCallbackFillX);
subBind(ewol::widget::Button, "[TEST]Button:Fill-y", signalValue, shared_from_this(), &appl::TestCheckBox::onCallbackFillY);
subBind(ewol::widget::Button, "[TEST]Button:TextToggle", signalValue, shared_from_this(), &appl::TestCheckBox::onCallbackTextToggle);
subBind(ewol::widget::Button, "[TEST]Button:ChangeText", signalPressed, shared_from_this(), &appl::TestCheckBox::onCallbackChangeText);
m_testWidget = std::dynamic_pointer_cast<ewol::widget::CheckBox>(getSubObjectNamed("[TEST]TO-TEST"));
if (m_testWidget == nullptr) {
APPL_CRITICAL("Can not get the pointer of the widget button pointer");
}
APPL_INFO("Create " __class__ " (end)");
}
void appl::TestCheckBox::onCallbackExpendX(const bool& _value) {
if (m_testWidget == nullptr) {
return;
}
m_testWidget->setExpand(bvec2(_value, m_testWidget->getExpand().y()));
}
void appl::TestCheckBox::onCallbackExpendY(const bool& _value) {
if (m_testWidget == nullptr) {
return;
}
m_testWidget->setExpand(bvec2(m_testWidget->getExpand().x(), _value));
}
void appl::TestCheckBox::onCallbackFillX(const bool& _value) {
if (m_testWidget == nullptr) {
return;
}
m_testWidget->setFill(bvec2(_value, m_testWidget->getFill().y()));
}
void appl::TestCheckBox::onCallbackFillY(const bool& _value) {
if (m_testWidget == nullptr) {
return;
}
m_testWidget->setFill(bvec2(m_testWidget->getFill().x(), _value));
}
void appl::TestCheckBox::onCallbackTextToggle(const bool& _value) {
if (m_testWidget == nullptr) {
return;
}
if (_value == true) {
m_testWidget->setSubWidgetToggle(ewol::widget::Label::create("A stupid very long text on toggle <br/><br/> and on multiple lines"));
} else {
m_testWidget->setSubWidgetToggle(nullptr);
}
}
void appl::TestCheckBox::onCallbackChangeText() {
if (m_testWidget == nullptr) {
return;
}
static int32_t countTextID = 1;
switch (countTextID) {
case 0:
m_testWidget->setSubWidget(ewol::widget::Label::create("simple Text"));
break;
case 1:
m_testWidget->setSubWidget(ewol::widget::Label::create("<left>Align Left</left>"));
break;
case 2:
m_testWidget->setSubWidget(ewol::widget::Label::create("<right>Align right</right>"));
break;
case 3:
m_testWidget->setSubWidget(ewol::widget::Label::create("<center>Align center</center>"));
break;
case 4:
m_testWidget->setSubWidget(ewol::widget::Label::create("simple Text<br/> With Some Other Lines<br/> and more if you want ...<br/> plop"));
break;
case 5:
m_testWidget->setSubWidget(ewol::widget::Label::create("simple <bold>Text</bold> with bold"));
break;
case 6:
m_testWidget->setSubWidget(ewol::widget::Label::create("simple <italic>Text</italic> with italic"));
break;
case 7:
m_testWidget->setSubWidget(ewol::widget::Label::create("simple <italic><bold>Text</bold></italic> with italic bold"));
break;
case 8:
m_testWidget->setSubWidget(nullptr);
countTextID=-1;
break;
}
// set at the subWidget all the space they can ...
if (m_testWidget->getSubWidget() != nullptr){
m_testWidget->getSubWidget()->setFill(bvec2(true,true));
m_testWidget->getSubWidget()->setExpand(bvec2(true,true));
}
countTextID++;
}

34
tools/visual_test/appl/TestCheckBox.h
View File

@ -1,34 +0,0 @@
/**
* @author Edouard DUPIN
*
* @copyright 2010, Edouard DUPIN, all right reserved
*
* @license BSD v3 (see license file)
*/
#pragma once
#include <appl/debug.h>
#include <ewol/widget/CheckBox.h>
#include <ewol/widget/Composer.h>
namespace appl {
class TestCheckBox : public ewol::widget::Composer {
private:
std::shared_ptr<ewol::widget::CheckBox> m_testWidget;
public:
// Constructeur
TestCheckBox();
void init();
public:
DECLARE_FACTORY(TestCheckBox);
protected:
void onCallbackExpendX(const bool& _value);
void onCallbackExpendY(const bool& _value);
void onCallbackFillX(const bool& _value);
void onCallbackFillY(const bool& _value);
void onCallbackTextToggle(const bool& _value);
void onCallbackChangeText();
};
}

4
tools/visual_test/appl/TestDistanceField.cpp
View File

@ -35,8 +35,8 @@ appl::TestDistanceField::TestDistanceField(){
void appl::TestDistanceField::init() { void appl::TestDistanceField::init() {
ewol::Widget::init(); ewol::Widget::init();
APPL_INFO("Create " __class__ " (start)"); APPL_INFO("Create " __class__ " (start)");
setExpand(bvec2(true, true)); propertyExpand.set(bvec2(true, true));
setFill(bvec2(true, true)); propertyFill.set(bvec2(true, true));
APPL_INFO("Create " __class__ " (end)"); APPL_INFO("Create " __class__ " (end)");
} }

0
tools/visual_test/appl/TestEntry.cpp
View File

0
tools/visual_test/appl/TestEntry.h
View File

145
tools/visual_test/appl/TestImage.cpp
View File

@ -1,145 +0,0 @@
/**
* @author Edouard DUPIN
*
* @copyright 2010, Edouard DUPIN, all right reserved
*
* @license BSD v3 (see license file)
*/
#include <appl/debug.h>
#include <appl/TestImage.h>
#include <ewol/widget/Button.h>
#include <ewol/widget/CheckBox.h>
#include <ewol/widget/Sizer.h>
#include <ewol/widget/Label.h>
#include <ewol/widget/Entry.h>
#include <ewol/widget/List.h>
#include <ewol/widget/ContextMenu.h>
#include <ewol/widget/PopUp.h>
#include <ewol/widget/Slider.h>
#include <ewol/widget/Composer.h>
#include <ewol/widget/Menu.h>
#include <ewol/widget/meta/FileChooser.h>
#include <ewol/widget/meta/Parameter.h>
#include <ewol/widget/Manager.h>
#undef __class__
#define __class__ "TestImage"
appl::TestImage::TestImage() {
addObjectType("appl::TestImage");
}
void appl::TestImage::init() {
ewol::widget::Composer::init();
APPL_INFO("Create " __class__ " (start)");
std::string myDescription = std::string("")
+ "<sizer mode='vert' fill='true' expand='true'>\n"
+ " <sizer mode='hori'>\n"
+ " <button name='[TEST]Button:Expand-x' toggle='true'>\n"
+ " <label>Expend X <br/> (false)</label>\n"
+ " <label>Expend X <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " <button name='[TEST]Button:Expand-y' toggle='true'>\n"
+ " <label>Expend Y <br/> (false)</label>\n"
+ " <label>Expend Y <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " <button name='[TEST]Button:Toggle' toggle='true'>\n"
+ " <label>Toggle <br/> (false)</label>\n"
+ " <label>Toggle <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " <button name='[TEST]Button:TextToggle' toggle='true'>\n"
+ " <label>Text On toggle state <br/> (false)</label>\n"
+ " <label>Text On toggle state <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " </sizer>\n"
+ " <sizer mode='hori'>\n"
+ " <button name='[TEST]Button:Fill-x' toggle='true'>\n"
+ " <label>Fill X <br/> (false)</label>\n"
+ " <label>Fill X <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " <button name='[TEST]Button:Fill-y' toggle='true'>\n"
+ " <label>Fill Y <br/> (false)</label>\n"
+ " <label>Fill Y <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " <button name='[TEST]Button:ChangeImage'>\n"
+ " <label>Change Image<br/> and other ...</label>\n"
+ " </button>\n"
+ " </sizer>\n"
+ " <sizer mode='hori'>\n"
+ " <spacer expand='false,false' fill='true,false' min-size='10,10px' color='#F008'/>\n"
+ " <sizer mode='vert'>\n"
+ " <spacer expand='false,false' fill='false,true' min-size='10,10px' color='#FF08'/>\n"
+ " <image name='[TEST]TO-TEST' expand='false,false' fill='false,false' src='DATA:sphere.png'/>\n"
+ " <spacer expand='false,false' fill='false,true' min-size='10,10px' color='#0FF8'/>\n"
+ " </sizer>\n"
+ " <spacer expand='false,false' fill='true,false' min-size='10,10px' color='#0F08'/>\n"
+ " </sizer>\n"
+ "</sizer>";
loadFromString(myDescription);
setExpand(bvec2(true,true));
setFill(bvec2(true,true));
subBind(ewol::widget::Button, "[TEST]Button:Expand-x", signalValue, shared_from_this(), &appl::TestImage::onCallbackExpendX);
subBind(ewol::widget::Button, "[TEST]Button:Expand-y", signalValue, shared_from_this(), &appl::TestImage::onCallbackExpendY);
subBind(ewol::widget::Button, "[TEST]Button:Fill-x", signalValue, shared_from_this(), &appl::TestImage::onCallbackFillX);
subBind(ewol::widget::Button, "[TEST]Button:Fill-y", signalValue, shared_from_this(), &appl::TestImage::onCallbackFillY);
subBind(ewol::widget::Button, "[TEST]Button:ChangeImage", signalPressed, shared_from_this(), &appl::TestImage::onCallbackChangeImage);
m_testWidget = std::dynamic_pointer_cast<ewol::widget::Image>(getSubObjectNamed("[TEST]TO-TEST"));
if (m_testWidget == nullptr) {
APPL_CRITICAL("Can not get the pointer of the widget button pointer");
}
APPL_INFO("Create " __class__ " (end)");
}
void appl::TestImage::onCallbackExpendX(const bool& _value) {
if (m_testWidget == nullptr) {
return;
}
m_testWidget->setExpand(bvec2(_value, m_testWidget->getExpand().y()));
}
void appl::TestImage::onCallbackExpendY(const bool& _value) {
if (m_testWidget == nullptr) {
return;
}
m_testWidget->setExpand(bvec2(m_testWidget->getExpand().x(), _value));
}
void appl::TestImage::onCallbackFillX(const bool& _value) {
if (m_testWidget == nullptr) {
return;
}
m_testWidget->setFill(bvec2(_value, m_testWidget->getFill().y()));
}
void appl::TestImage::onCallbackFillY(const bool& _value) {
if (m_testWidget == nullptr) {
return;
}
m_testWidget->setFill(bvec2(m_testWidget->getFill().x(), _value));
}
void appl::TestImage::onCallbackChangeImage() {
if (m_testWidget == nullptr) {
return;
}
static int32_t countID = 1;
switch (countID) {
case 0:
m_testWidget->setFile("DATA:stone.png");
break;
case 1:
m_testWidget->setFile("DATA:grass.png");
break;
default:
m_testWidget->setFile("DATA:sphere.png");
countID=-1;
break;
}
countID++;
}

36
tools/visual_test/appl/TestImage.h
View File

@ -1,36 +0,0 @@
/**
* @author Edouard DUPIN
*
* @copyright 2010, Edouard DUPIN, all right reserved
*
* @license BSD v3 (see license file)
*/
#pragma once
#include <appl/debug.h>
#include <ewol/widget/Widget.h>
#include <ewol/widget/Button.h>
#include <ewol/widget/Image.h>
#include <ewol/widget/Spacer.h>
#include <ewol/widget/Composer.h>
namespace appl {
class TestImage : public ewol::widget::Composer {
private:
std::shared_ptr<ewol::widget::Image> m_testWidget;
public:
// Constructeur
TestImage();
void init();
public:
DECLARE_FACTORY(TestImage);
virtual ~TestImage() {};
protected:
void onCallbackExpendX(const bool& _value);
void onCallbackExpendY(const bool& _value);
void onCallbackFillX(const bool& _value);
void onCallbackFillY(const bool& _value);
void onCallbackChangeImage();
};
}

180
tools/visual_test/appl/TestLabel.cpp
View File

@ -1,180 +0,0 @@
/**
* @author Edouard DUPIN
*
* @copyright 2010, Edouard DUPIN, all right reserved
*
* @license BSD v3 (see license file)
*/
#include <appl/debug.h>
#include <appl/TestLabel.h>
#include <ewol/widget/Button.h>
#include <ewol/widget/CheckBox.h>
#include <ewol/widget/Sizer.h>
#include <ewol/widget/Label.h>
#include <ewol/widget/Entry.h>
#include <ewol/widget/List.h>
#include <ewol/widget/ContextMenu.h>
#include <ewol/widget/PopUp.h>
#include <ewol/widget/Slider.h>
#include <ewol/widget/Menu.h>
#include <ewol/widget/meta/FileChooser.h>
#include <ewol/widget/meta/Parameter.h>
#include <ewol/widget/Manager.h>
#undef __class__
#define __class__ "TestButton"
appl::TestLabel::TestLabel() {
addObjectType("appl::TestLabel");
}
void appl::TestLabel::init() {
ewol::widget::Composer::init();
APPL_INFO("Create " __class__ " (start)");
std::string myDescription = std::string("")
+ "<sizer mode='vert' fill='true' expand='true'>\n"
+ " <sizer mode='hori'>\n"
+ " <button name='[TEST]Button:Expand-x' toggle='true'>\n"
+ " <label>Expend X <br/> (false)</label>\n"
+ " <label>Expend X <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " <button name='[TEST]Button:Expand-y' toggle='true'>\n"
+ " <label>Expend Y <br/> (false)</label>\n"
+ " <label>Expend Y <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " <button name='[TEST]Button:Toggle' toggle='true'>\n"
+ " <label>Toggle <br/> (false)</label>\n"
+ " <label>Toggle <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " <button name='[TEST]Button:TextToggle' toggle='true'>\n"
+ " <label>Text On toggle state <br/> (false)</label>\n"
+ " <label>Text On toggle state <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " </sizer>\n"
+ " <sizer mode='hori'>\n"
+ " <button name='[TEST]Button:Fill-x' toggle='true'>\n"
+ " <label>Fill X <br/> (false)</label>\n"
+ " <label>Fill X <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " <button name='[TEST]Button:Fill-y' toggle='true'>\n"
+ " <label>Fill Y <br/> (false)</label>\n"
+ " <label>Fill Y <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " <button name='[TEST]Button:SetMaxSize' toggle='true'>\n"
+ " <label>Max Size <br/> (false)</label>\n"
+ " <label>Max Size <br/> <b>(true)</b></label>\n"
+ " </button>\n"
+ " <button name='[TEST]Button:ChangeText'>\n"
+ " <label>Change Text<br/> and other ...</label>\n"
+ " </button>\n"
+ " </sizer>\n"
+ " <sizer mode='hori'>\n"
+ " <spacer expand='false,false' fill='true,false' min-size='10,10px' color='#F008'/>\n"
+ " <sizer mode='vert'>\n"
+ " <spacer expand='false,false' fill='false,true' min-size='10,10px' color='#FF08'/>\n"
+ " <label name='[TEST]TO-TEST' expand='false,false' fill='false,false' >\n"
+ " Text de base ...\n"
+ " </label>\n"
+ " <spacer expand='false,false' fill='false,true' min-size='10,10px' color='#0FF8'/>\n"
+ " </sizer>\n"
+ " <spacer expand='false,false' fill='true,false' min-size='10,10px' color='#0F08'/>\n"
+ " </sizer>\n"
+ "</sizer>";
loadFromString(myDescription);
setExpand(bvec2(true,true));
setFill(bvec2(true,true));
subBind(ewol::widget::Button, "[TEST]Button:Expand-x", signalValue, shared_from_this(), &appl::TestLabel::onCallbackExpendX);
subBind(ewol::widget::Button, "[TEST]Button:Expand-y", signalValue, shared_from_this(), &appl::TestLabel::onCallbackExpendY);
subBind(ewol::widget::Button, "[TEST]Button:Fill-x", signalValue, shared_from_this(), &appl::TestLabel::onCallbackFillX);
subBind(ewol::widget::Button, "[TEST]Button:Fill-y", signalValue, shared_from_this(), &appl::TestLabel::onCallbackFillY);
subBind(ewol::widget::Button, "[TEST]Button:SetMaxSize", signalValue, shared_from_this(), &appl::TestLabel::onCallbackMaxSize);
subBind(ewol::widget::Button, "[TEST]Button:ChangeText", signalPressed, shared_from_this(), &appl::TestLabel::onCallbackChangeLabel);
m_testWidget = std::dynamic_pointer_cast<ewol::widget::Label>(getSubObjectNamed("[TEST]TO-TEST"));
if (m_testWidget == nullptr) {
APPL_CRITICAL("Can not get the pointer of the widget button pointer");
}
APPL_INFO("Create " __class__ " (end)");
}
void appl::TestLabel::onCallbackExpendX(const bool& _value) {
if (m_testWidget == nullptr) {
return;
}
m_testWidget->setExpand(bvec2(_value, m_testWidget->getExpand().y()));
}
void appl::TestLabel::onCallbackExpendY(const bool& _value) {
if (m_testWidget == nullptr) {
return;
}
m_testWidget->setExpand(bvec2(m_testWidget->getExpand().x(), _value));
}
void appl::TestLabel::onCallbackFillX(const bool& _value) {
if (m_testWidget == nullptr) {
return;
}
m_testWidget->setFill(bvec2(_value, m_testWidget->getFill().y()));
}
void appl::TestLabel::onCallbackFillY(const bool& _value) {
if (m_testWidget == nullptr) {
return;
}
m_testWidget->setFill(bvec2(m_testWidget->getFill().x(), _value));
}
void appl::TestLabel::onCallbackMaxSize(const bool& _value) {
if (m_testWidget == nullptr) {
return;
}
if (_value == true) {
m_testWidget->setMaxSize(vec2(400,9999999999));
} else {
m_testWidget->setNoMaxSize();
}
}
void appl::TestLabel::onCallbackChangeLabel() {
if (m_testWidget == nullptr) {
return;
}
m_labelId++;
switch(m_labelId) {
default:
m_labelId=0;
case 0:
m_testWidget->setLabel("Basic label");
break;
case 1:
m_testWidget->setLabel("Basic <bold>label</bold>");
break;
case 2:
m_testWidget->setLabel("<center>\n"
" Un jour Cosette se <b>regarda</b> par hasard dans son miroir et se dit: Tiens! <b>Il lui semblait presque <i>qu'elle à jolie.</i></b> Ceci la jeta dans un trouble singulier. <font color=\"#FF0000\">Jusqu'au moment elle <b>n'avait</b> point <i>song figure.</i></font> Elle se voyait dans son miroir, mais elle ne s'y regardait pas. Et puis, on lui avait souvent dit qu'elle à laide;<br/> Jean Valjean seul disait doucement : <br/> Mais non!<br/> mais non!<br/> Quoi qu'il en fut, Cosette toujours crue laide, et avait grandi dans cette id ec la réation facile de l'enfance. Voici que tout d'un coup son miroir lui disait comme Jean Valjean : Mais non! Elle ne dormit pas de la nuit. Si jolie ? pensait-elle, comme cela serait drole que je fusse jolie! Et elle se rappelait celles de ses compagnes dont la beauté sait effet dans le couvent, et elle se disait : Comment! je serais comme mademoiselle une telle!\n"
"</center>\n");
break;
case 3:
m_testWidget->setLabel("<left>\n"
" Un jour Cosette se <b>regarda</b> par hasard dans son miroir et se dit: Tiens! <b>Il lui semblait presque <i>qu'elle à jolie.</i></b> Ceci la jeta dans un trouble singulier. <font color=\"#0F0\">Jusqu'au moment elle <b>n'avait</b> point <i>song figure.</i></font> Elle se voyait dans son miroir, mais elle ne s'y regardait pas. Et puis, on lui avait souvent dit qu'elle à laide;<br/> Jean Valjean seul disait doucement :<br/> Mais non!<br/> mais non!<br/> Quoi qu'il en fut, Cosette toujours crue laide, et avait grandi dans cette id ec la réation facile de l'enfance. Voici que tout d'un coup son miroir lui disait comme Jean Valjean : Mais non! Elle ne dormit pas de la nuit. Si jolie ? pensait-elle, comme cela serait drole que je fusse jolie! Et elle se rappelait celles de ses compagnes dont la beauté sait effet dans le couvent, et elle se disait : Comment! je serais comme mademoiselle une telle!\n"
"</left>\n");
break;
case 4:
m_testWidget->setLabel("<right>\n"
" Un jour Cosette se <b>regarda</b> par hasard dans son miroir et se dit: Tiens! <b>Il lui semblait presque <i>qu'elle à jolie.</i></b> Ceci la jeta dans un trouble singulier. <font color=\"#00F\">Jusqu'au moment elle<b> n'avait</b> point <i>song figure.</i></font> Elle se voyait dans son miroir, mais elle ne s'y regardait pas. Et puis, on lui avait souvent dit qu'elle à laide;<br/> Jean Valjean seul disait doucement :<br/> Mais non! <br/> mais non!<br/> Quoi qu'il en fut, Cosette toujours crue laide, et avait grandi dans cette id ec la réation facile de l'enfance. Voici que tout d'un coup son miroir lui disait comme Jean Valjean : Mais non! Elle ne dormit pas de la nuit. Si jolie ? pensait-elle, comme cela serait drole que je fusse jolie! Et elle se rappelait celles de ses compagnes dont la beauté sait effet dans le couvent, et elle se disait : Comment! je serais comme mademoiselle une telle!\n"
"</right>\n");
break;
case 5:
m_testWidget->setLabel("<justify>\n"
" Un jour Cosette se <b>regarda</b> par hasard dans son miroir et se dit: Tiens! <b>Il lui semblait presque <i>qu'elle à jolie.</i></b> Ceci la jeta dans un trouble singulier. <font color=\"#FF0\">Jusqu'au moment elle <b>n'avait</b> point <i>song figure.</i></font> Elle se voyait dans son miroir, mais elle ne s'y regardait pas. Et puis, on lui avait souvent dit qu'elle à laide;<br/> Jean Valjean seul disait doucement :<br/> Mais non!<br/> mais non!<br/> Quoi qu'il en fut, Cosette toujours crue laide, et avait grandi dans cette id ec la réation facile de l'enfance. Voici que tout d'un coup son miroir lui disait comme Jean Valjean : Mais non! Elle ne dormit pas de la nuit. Si jolie ? pensait-elle, comme cela serait drole que je fusse jolie! Et elle se rappelait celles de ses compagnes dont la beauté sait effet dans le couvent, et elle se disait : Comment! je serais comme mademoiselle une telle!\n"
"</justify>\n");
break;
}
}

44
tools/visual_test/appl/TestLabel.h
View File

@ -1,44 +0,0 @@
/**
* @author Edouard DUPIN
*
* @copyright 2010, Edouard DUPIN, all right reserved
*
* @license BSD v3 (see license file)
*/
#pragma once
#include <appl/debug.h>
#include <ewol/widget/Widget.h>
#include <ewol/widget/Button.h>
#include <ewol/widget/Label.h>
#include <ewol/widget/Spacer.h>
#include <ewol/widget/Composer.h>
namespace appl {
class TestLabel : public ewol::widget::Composer {
private:
std::shared_ptr<ewol::widget::Label> m_testWidget;
int32_t m_labelId;
public:
/**
* @brief Constructeur
*/
TestLabel();
void init();
public:
DECLARE_FACTORY(TestLabel);
/**
* @brief Destructor
*/
virtual ~TestLabel() {};
protected:
void onCallbackExpendX(const bool& _value);
void onCallbackExpendY(const bool& _value);
void onCallbackFillX(const bool& _value);
void onCallbackFillY(const bool& _value);
void onCallbackMaxSize(const bool& _value);
void onCallbackChangeLabel();
};
}

0
tools/visual_test/appl/TestProgressBar.cpp
View File

0
tools/visual_test/appl/TestProgressBar.h
View File

340
tools/visual_test/appl/TestScene.cpp
View File

@ -1,340 +0,0 @@
/**
* @author Edouard DUPIN
*
* @copyright 2010, Edouard DUPIN, all right reserved
*
* @license BSD v3 (see license file)
*/
#include <appl/debug.h>
#include <appl/TestScene.h>
#include <etk/tool.h>
#include <ewol/widget/Button.h>
#include <ewol/widget/CheckBox.h>
#include <ewol/widget/Sizer.h>
#include <ewol/widget/Label.h>
#include <ewol/widget/Entry.h>
#include <ewol/widget/List.h>
#include <ewol/widget/ContextMenu.h>
#include <ewol/widget/PopUp.h>
#include <ewol/widget/Slider.h>
#include <ewol/widget/Spacer.h>
#include <ewol/widget/Menu.h>
#include <ewol/widget/meta/FileChooser.h>
#include <ewol/widget/meta/Parameter.h>
#include <ewol/widget/Manager.h>
static const char * l_eventAddBox = "event-add-box";
static const char * l_eventAddSphere = "event-add-sphere";
static const char * l_eventRotationX = "event-rotation-X";
static const char * l_eventRotationY = "event-rotation-Y";
static const char * l_eventRotationZ = "event-rotation-Z";
static const char * l_eventRotation0 = "event-rotation-0";
static const char * l_eventLunch = "event-lunch";
static const char * l_eventChangeTimeSpeed4 = "event-speed4";
static const char * l_eventChangeTimeSpeed2 = "event-speed2";
static const char * l_eventChangeTimeSpeed0 = "event-speed0.5";
static const char * l_eventChangeTimeSpeed1 = "event-speed1";
static const char * l_eventUp = "event-up";
static const char * l_eventDown = "event-down";
#undef __class__
#define __class__ "TestScene"
TestScene::TestScene() :
ewol::widget::Sizer(ewol::widget::Sizer::modeVert)
{
addObjectType("appl::TestScene");
/*
m_ground = new game::Element("DATA:grass.obj");
if (nullptr != m_ground) {
m_ground->SetStaticMode(true);
m_gameEngine.AddElement(m_ground);
}
*/
APPL_CRITICAL("Create "__class__" (start)");
std::shared_ptr<ewol::widget::Sizer> mySizerVert2 = nullptr;
std::shared_ptr<ewol::widget::Sizer> mySizerHori = nullptr;
std::shared_ptr<ewol::widget::Button> myButton = nullptr;
/*
mySizerHori = new ewol::widget::SizerHori();
if (nullptr == mySizerHori) {
APPL_DEBUG("Allocation error mySizerHori");
return;
}
SubWidgetAdd(mySizerHori);
myButton = new ewol::widget::Button("Add Box");
if (nullptr != myButton) {
myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventAddBox);
mySizerHori->SubWidgetAdd(myButton);
}
myButton = new ewol::widget::Button("Add Sphere");
if (nullptr != myButton) {
myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventAddSphere);
mySizerHori->SubWidgetAdd(myButton);
}
myButton = new ewol::widget::Button("Rotation X");
if (nullptr != myButton) {
myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventRotationX);
mySizerHori->SubWidgetAdd(myButton);
}
myButton = new ewol::widget::Button("Rotation Y"); = nullptr
if (nullptr != myButton) {
myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventRotationY);
mySizerHori->SubWidgetAdd(myButton);
}
myButton = new ewol::widget::Button("Rotation Z");
if (nullptr != myButton) {
myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventRotationZ);
mySizerHori->SubWidgetAdd(myButton);
}
myButton = new ewol::widget::Button("Rotation -");
if (nullptr != myButton) {
myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventRotation0);
mySizerHori->SubWidgetAdd(myButton);
}
myButton = new ewol::widget::Button("UP");
if (nullptr != myButton) {
myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventUp);
mySizerHori->SubWidgetAdd(myButton);
}
myButton = new ewol::widget::Button("DOWN");
if (nullptr != myButton) {
myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventDown);
mySizerHori->SubWidgetAdd(myButton);
}
mySizerHori = new ewol::widget::SizerHori();
if (nullptr == mySizerHori) {
APPL_DEBUG("Allocation error mySizerHori");
return;
}
SubWidgetAdd(mySizerHori);
myButton = new ewol::widget::Button("lunch object");
if (nullptr != myButton) {
myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventLunch);
mySizerHori->SubWidgetAdd(myButton);
}
myButton = new ewol::widget::Button("1x speed");
if (nullptr != myButton) {
myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventChangeTimeSpeed1);
mySizerHori->SubWidgetAdd(myButton);
}
myButton = new ewol::widget::Button("0.5x speed");
if (nullptr != myButton) {
myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventChangeTimeSpeed0);
mySizerHori->SubWidgetAdd(myButton);
}
myButton = new ewol::widget::Button("2x speed");
if (nullptr != myButton) {
myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventChangeTimeSpeed2);
mySizerHori->SubWidgetAdd(myButton);
}
myButton = new ewol::widget::Button("4x speed");
if (nullptr != myButton) {
myButton->RegisterOnEvent(this, ewolEventButtonPressed, l_eventChangeTimeSpeed4);
mySizerHori->SubWidgetAdd(myButton);
}
*/
std::shared_ptr<ewol::widget::Spacer> mySpacer = new widget::Spacer();
if (nullptr != mySpacer) {
mySpacer->setExpand(bvec2(false,false));
mySpacer->setFill(bvec2(true,false));
mySpacer->setMinSize(vec2(10,10));
mySpacer->setColor(0xFF000080);
subWidgetAdd(mySpacer);
}
mySizerHori = new ewol::widget::Sizer(ewol::widget::Sizer::modeHori);
if (nullptr == mySizerHori) {
APPL_DEBUG("Allocation error mySizerHori");
return;
}
subWidgetAdd(mySizerHori);
mySpacer = new ewol::widget::Spacer();
if (nullptr != mySpacer) {
mySpacer->setExpand(bvec2(false,false));
mySpacer->setFill(bvec2(false,true));
mySpacer->setMinSize(vec2(10,10));
mySpacer->setColor(0x00FF0080);
mySizerHori->subWidgetAdd(mySpacer);
}
m_testWidget = new ewol::widget::Scene(/*&m_gameEngine*/ nullptr);
if (nullptr != m_testWidget) {
m_testWidget->setExpand(bvec2(true,true));
m_testWidget->setFill(bvec2(true,true));
mySizerHori->subWidgetAdd(m_testWidget);
}
mySpacer = new ewol::widget::Spacer();
if (nullptr != mySpacer) {
mySpacer->setExpand(bvec2(false,false));
mySpacer->setFill(bvec2(false,true));
mySpacer->setMinSize(vec2(10,10));
mySpacer->setColor(0x0000FF80);
mySizerHori->subWidgetAdd(mySpacer);
}
mySpacer = new ewol::widget::Spacer();
if (nullptr != mySpacer) {
mySpacer->setExpand(bvec2(false,false));
mySpacer->setFill(bvec2(true,false));
mySpacer->setMinSize(vec2(10,10));
mySpacer->setColor(0x00FFFF80);
subWidgetAdd(mySpacer);
}
APPL_INFO("Create "__class__" (end)");
}
TestScene::~TestScene() {
APPL_INFO("Remove "__class__" ...");
}
/*
#include <ewol/game/Element.h>
vec3 baseRotationVect;
vec3 baseMove;
class stupidCube : public game::Element
{
public:
stupidCube(float poidKg=0.0f) : game::Element("DATA:cube.obj")
{
m_mass = poidKg;
};
// herited methode
virtual bool ArtificialIntelligence(float delta)
{
if (m_mass == 0.0f) {
if (baseRotationVect != vec3(0,0,0) ) {
Rotate(baseRotationVect, 0.5 * delta );
}
if (baseMove != vec3(0,0,0) ) {
Translate(baseMove);
baseMove = vec3(0,0,0);
}
}
return false;
}
};
class stupidSphere : public game::Element
{
public:
stupidSphere(float poidKg=0.0f) : game::Element("DATA:sphere.obj")
{
m_mass = poidKg;
};
// herited methode
virtual bool ArtificialIntelligence(float delta)
{
if (m_mass == 0.0f) {
if (baseRotationVect != vec3(0,0,0) ) {
Rotate(baseRotationVect, 0.5 * delta );
}
if (baseMove != vec3(0,0,0) ) {
Translate(baseMove);
baseMove = vec3(0,0,0);
}
}
return false;
}
};
*/
void TestScene::onReceiveMessage(const ewol::object::Message& _msg) {
ewol::widget::Sizer::onReceiveMessage(_msg);
/*
//APPL_INFO("Receive Event from the main windows ... : \"" << eventId << "\" ==> data=\"" << data << "\"" );
if (m_testWidget == CallerObject) {
APPL_WARNING("Receive Event from tested Scene ... : \"" << eventId << "\" ==> data=\"" << data << "\"" );
}
if (eventId == l_eventAddBox) {
static bool firstTime = true;
if (firstTime==false) {
stupidCube * tmpp = new stupidCube();
vec3 newPos = vec3(etk::tool::frand(-40,40),etk::tool::frand(-40,40),etk::tool::frand(1,8));
APPL_DEBUG("add a box at the pos : " << newPos);
tmpp->Translate(newPos);
tmpp->Scale(etk::tool::frand(0.5,2) );
float angle = etk::tool::frand(-M_PI,M_PI);
tmpp->Rotate(vec3(1,0,0), angle);
angle = etk::tool::frand(-M_PI,M_PI);
tmpp->Rotate(vec3(0,1,0), angle);
angle = etk::tool::frand(-M_PI,M_PI);
tmpp->Rotate(vec3(0,0,1), angle);
m_gameEngine.AddElement(tmpp);
} else {
firstTime = false;
stupidCube * tmpp = new stupidCube();
m_gameEngine.AddElement(tmpp);
}
} else if (eventId == l_eventAddSphere) {
if (nullptr!=m_testWidget) {
stupidSphere * tmpp = new stupidSphere();
vec3 newPos = vec3(etk::tool::frand(-40,40),etk::tool::frand(-40,40),etk::tool::frand(1,8));
APPL_DEBUG("add a box at the pos : " << newPos);
tmpp->Translate(newPos);
tmpp->Scale(etk::tool::frand(0.5,2) );
float angle = etk::tool::frand(-M_PI,M_PI);
tmpp->Rotate(vec3(1,0,0), angle);
angle = etk::tool::frand(-M_PI,M_PI);
tmpp->Rotate(vec3(0,1,0), angle);
angle = etk::tool::frand(-M_PI,M_PI);
tmpp->Rotate(vec3(0,0,1), angle);
m_gameEngine.AddElement(tmpp);
}
} else if (eventId == l_eventUp) {
baseMove = vec3(0.1,0,0);
} else if (eventId == l_eventDown) {
baseMove = vec3(-0.1,0,0);
} else if (eventId == l_eventRotationX) {
baseRotationVect = vec3(1,0,0);
} else if (eventId == l_eventRotationY) {
baseRotationVect = vec3(0,1,0);
} else if (eventId == l_eventRotationZ) {
baseRotationVect = vec3(0,0,1);
} else if (eventId == l_eventRotation0) {
baseRotationVect = vec3(0,0,0);
} else if (eventId == l_eventLunch) {
stupidCube * tmpp = new stupidCube(250);
vec3 newPos = vec3(5,5,100);
tmpp->Translate(newPos);
tmpp->SetSpeed(vec3(10,10,50));
m_gameEngine.AddElement(tmpp);
} else if (eventId == l_eventChangeTimeSpeed1) {
if (nullptr!=m_testWidget) {
m_testWidget->SetRatioTime(1);
}
} else if (eventId == l_eventChangeTimeSpeed0) {
if (nullptr!=m_testWidget) {
m_testWidget->SetRatioTime(0.5);
}
} else if (eventId == l_eventChangeTimeSpeed2) {
if (nullptr!=m_testWidget) {
m_testWidget->SetRatioTime(2);
}
} else if (eventId == l_eventChangeTimeSpeed4) {
if (nullptr!=m_testWidget) {
m_testWidget->SetRatioTime(4);
}
}
*/
return;
}

25
tools/visual_test/appl/TestScene.h
View File

@ -1,25 +0,0 @@
/**
* @author Edouard DUPIN
*
* @copyright 2010, Edouard DUPIN, all right reserved
*
* @license BSD v3 (see license file)
*/
#pragma once
#include <appl/debug.h>
#include <ewol/widget/Widget.h>
#include <ewol/widget/Scene.h>
#include <ewol/widget/Sizer.h>
class TestScene : public ewol::widget::Sizer {
private:
std::shared_ptr<ewol::widget::Scene> m_testWidget;
public:
// Constructeur
TestScene();
virtual ~TestScene();
public: // Derived function
virtual void onReceiveMessage(const ewol::object::Message& _msg);
};

0
tools/visual_test/appl/TestSlider.cpp
View File

0
tools/visual_test/appl/TestSlider.h
View File

0
tools/visual_test/appl/WidgetTest.cpp
View File

0
tools/visual_test/appl/WidgetTest.h
View File

3
tools/visual_test/appl/init.cpp
View File

@ -13,7 +13,6 @@
#include <ewol/object/Object.h> #include <ewol/object/Object.h>
#include <ewol/context/Context.h> #include <ewol/context/Context.h>
#include <ewol/widget/Manager.h> #include <ewol/widget/Manager.h>
#include <appl/widget/SizerColor.h>
#include <appl/debug.h> #include <appl/debug.h>
#include <appl/MainWindows.h> #include <appl/MainWindows.h>
@ -49,8 +48,6 @@ class MainApplication : public ewol::context::Application {
// set the application icon ... // set the application icon ...
_context.setIcon("DATA:icon.png"); _context.setIcon("DATA:icon.png");
appl::widget::SizerColor::createManagerWidget(_context.getWidgetManager());
APPL_INFO("==> CREATE ... (END)"); APPL_INFO("==> CREATE ... (END)");
} }

149
tools/visual_test/appl/widget/SizerColor.cpp
View File

@ -1,149 +0,0 @@
/**
* @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file)
*/
#include <appl/debug.h>
#include <appl/widget/SizerColor.h>
#undef __class__
#define __class__ "SizerColor"
appl::widget::SizerColor::SizerColor() :
m_borderColor(*this, "border-color", etk::color::none, "Color of the border"),
m_leftColor(*this, "color-left", etk::color::purple),
m_rightColor(*this, "color-right", etk::color::orange),
m_topColor(*this, "color-top", etk::color::cyan),
m_buttomColor(*this, "color-buttom", etk::color::brown) {
addObjectType("appl::widget::SizerColor");
}
void appl::widget::SizerColor::init(enum displayMode _mode) {
ewol::widget::Sizer::init();
}
appl::widget::SizerColor::~SizerColor() {
}
void appl::widget::SizerColor::onRegenerateDisplay() {
ewol::widget::Sizer::onRegenerateDisplay();
m_draw.clear();
vec2 tmpBorderSize = m_borderSize->getPixel();
if (tmpBorderSize == vec2(0.0f, 0.0f)) {
return;
}
if (m_borderColor->a() == 0) {
return;
}
m_draw.setColor(m_borderColor);
m_draw.setPos(vec3(0, 0, 0) );
m_draw.rectangleWidth(vec3(tmpBorderSize.x(), m_size.y(),0) );
m_draw.setPos(vec3(m_size.x() - tmpBorderSize.x(), 0, 0) );
m_draw.rectangleWidth(vec3(tmpBorderSize.x(), m_size.y(),0) );
m_draw.setPos(vec3(tmpBorderSize.x(), 0, 0) );
m_draw.rectangleWidth(vec3(m_size.x()-tmpBorderSize.x()*2.0f, tmpBorderSize.y(),0) );
m_draw.setPos(vec3(tmpBorderSize.x(), m_size.y()-tmpBorderSize.y(), 0) );
m_draw.rectangleWidth(vec3(m_size.x()-tmpBorderSize.x()*2.0f, tmpBorderSize.y(),0) );
vec2 underSize(0,0);
vec2 underOrigin(999999999999.0,999999999999.0);
for (auto &it : m_subWidget) {
if (it == nullptr) {
continue;
}
vec2 size = it->getSize();
if (m_mode == ewol::widget::Sizer::modeVert) {
underSize += vec2(0.0f, size.y());
underSize.setX(std::max(underSize.x(), size.x()));
} else {
underSize += vec2(size.x(), 0.0f);
underSize.setY(std::max(underSize.y(), size.y()));
}
underOrigin.setX(std::min(it->getOrigin().x(), underOrigin.x()));
underOrigin.setY(std::min(it->getOrigin().y(), underOrigin.y()));
}
vec2 localWidgetSize = m_size - tmpBorderSize*2.0f;
vec2 localWidgetOrigin = m_origin + tmpBorderSize;
for (auto &it : m_subWidget) {
if (it == nullptr) {
continue;
}
vec2 origin = it->getOrigin();
vec2 size = it->getSize();
// now we display around the widget every element needed
if (m_mode == ewol::widget::Sizer::modeHori) {
if (size.y() < localWidgetSize.y()) {
// under
if ((uint32_t(m_gravity) & uint32_t(ewol::gravity_buttom)) == 0) {
m_draw.setColor(m_buttomColor);
m_draw.setPos(vec2(origin.x(), localWidgetOrigin.y()) - m_origin);
m_draw.rectangleWidth(vec2(it->getSize().x(), origin.y()-localWidgetOrigin.y()) );
}
// upper
if ((uint32_t(m_gravity) & uint32_t(ewol::gravity_top)) == 0) {
m_draw.setColor(m_topColor);
float startDraw = origin.y()+it->getSize().y() - m_origin.y();
m_draw.setPos(vec2(origin.x()-m_origin.x(), startDraw));
m_draw.rectangleWidth(vec2(it->getSize().x(), localWidgetSize.y()-startDraw+tmpBorderSize.y()) );
}
}
} else {
if (size.x() < localWidgetSize.x()) {
// left
if ((uint32_t(m_gravity) & uint32_t(ewol::gravity_left)) == 0) {
m_draw.setColor(m_leftColor);
m_draw.setPos(vec2(localWidgetOrigin.x(), origin.y()) - m_origin);
m_draw.rectangleWidth(vec2(origin.x()-localWidgetOrigin.x(), it->getSize().y()) );
}
// right
if ((uint32_t(m_gravity) & uint32_t(ewol::gravity_right)) == 0) {
m_draw.setColor(m_rightColor);
float startDraw = origin.x()+it->getSize().x() - m_origin.x();
m_draw.setPos(vec2(startDraw, origin.y()-m_origin.y()));
m_draw.rectangleWidth(vec2(localWidgetSize.x()-startDraw+tmpBorderSize.x(), it->getSize().y()) );
}
}
}
}
// now we do the rest of the sizer:
if (m_mode == ewol::widget::Sizer::modeHori) {
if (underSize.x() < localWidgetSize.x()) {
// left
if ((uint32_t(m_gravity) & uint32_t(ewol::gravity_left)) == 0) {
m_draw.setColor(m_leftColor);
m_draw.setPos(localWidgetOrigin - m_origin);
m_draw.rectangleWidth(vec2(underOrigin.x()-localWidgetOrigin.x(), localWidgetSize.y()) );
}
// right
if ((uint32_t(m_gravity) & uint32_t(ewol::gravity_right)) == 0) {
m_draw.setColor(m_rightColor);
float startDraw = underOrigin.x() + underSize.x() - m_origin.x();
m_draw.setPos(vec2(startDraw, localWidgetOrigin.y()-m_origin.y()));
m_draw.rectangleWidth(vec2(localWidgetSize.x()-startDraw+tmpBorderSize.x(), localWidgetSize.y()) );
}
}
} else {
if (underSize.y() < localWidgetSize.y()) {
// under
if ((uint32_t(m_gravity) & uint32_t(ewol::gravity_buttom)) == 0) {
m_draw.setColor(m_buttomColor);
m_draw.setPos(localWidgetOrigin - m_origin);
m_draw.rectangleWidth(vec2(localWidgetSize.x(), underOrigin.y()-localWidgetOrigin.y()) );
}
// upper
if ((uint32_t(m_gravity) & uint32_t(ewol::gravity_top)) == 0) {
m_draw.setColor(m_topColor);
float startDraw = underOrigin.y() + underSize.y() - m_origin.y();
m_draw.setPos(vec2(localWidgetOrigin.x()-m_origin.x(), startDraw));
m_draw.rectangleWidth(vec2(localWidgetSize.x(), localWidgetSize.y()-startDraw+tmpBorderSize.y()) );
}
}
}
}
void appl::widget::SizerColor::onDraw() {
m_draw.draw();
ewol::widget::Sizer::onDraw();
}

50
tools/visual_test/appl/widget/SizerColor.h
View File

@ -1,50 +0,0 @@
/**
* @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file)
*/
#pragma once
#include <etk/types.h>
#include <ewol/widget/Sizer.h>
#include <etk/Color.h>
#include <ewol/compositing/Drawing.h>
namespace appl {
namespace widget {
class SizerColor : public ewol::widget::Sizer {
public:
/**
* @brief Main call of recording the widget on the List of "widget named creator"
*/
static void init(ewol::widget::Manager& _widgetManager);
protected:
/**
* @brief Constructor
* @param[in] _mode The mode to display the elements
*/
SizerColor();
void init(enum displayMode _mode=ewol::widget::Sizer::modeHori);
public:
DECLARE_WIDGET_FACTORY(SizerColor, "SizerColor");
/**
* @brief Desstructor
*/
virtual ~SizerColor();
private:
eproperty::Value<etk::Color<>> m_borderColor; //!< Border color.
eproperty::Value<etk::Color<>> m_leftColor; //!< Left color.
eproperty::Value<etk::Color<>> m_rightColor; //!< Right color.
eproperty::Value<etk::Color<>> m_topColor; //!< Top color.
eproperty::Value<etk::Color<>> m_buttomColor; //!< Buttom color.
private:
ewol::compositing::Drawing m_draw; //!< Compositing drawing element for display the border.
public:
virtual void onRegenerateDisplay();
virtual void onDraw();
};
}
}