[DEV/DEBUG] update esignal removing ISignal and correct pop-up auto exit and widget slider callback
This commit is contained in:
parent
ca1b8144b5
commit
ce98d39d34
@ -28,7 +28,6 @@ namespace etk {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// declare for signal event
|
// declare for signal event
|
||||||
#include <esignal/details/ISignal.hxx>
|
#include <esignal/details/Signal.hxx>
|
||||||
template class esignal::Signal<ewol::event::Time>;
|
ESIGNAL_DECLARE_SIGNAL(ewol::event::Time);
|
||||||
template class esignal::ISignal<ewol::event::Time>;
|
|
||||||
|
|
||||||
|
@ -16,6 +16,7 @@ ewol::object::Manager::Manager(ewol::Context& _context) :
|
|||||||
m_applWakeUpTime(0),
|
m_applWakeUpTime(0),
|
||||||
m_lastPeriodicCallTime(0) {
|
m_lastPeriodicCallTime(0) {
|
||||||
EWOL_DEBUG(" == > init Object-Manager");
|
EWOL_DEBUG(" == > init Object-Manager");
|
||||||
|
periodicCall.setPeriodic(true);
|
||||||
// set the basic time properties :
|
// set the basic time properties :
|
||||||
m_applWakeUpTime = ewol::getTime();
|
m_applWakeUpTime = ewol::getTime();
|
||||||
m_lastPeriodicCallTime = ewol::getTime();
|
m_lastPeriodicCallTime = ewol::getTime();
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
#include <etk/types.h>
|
#include <etk/types.h>
|
||||||
#include <ewol/object/Object.h>
|
#include <ewol/object/Object.h>
|
||||||
#include <esignal/ISignal.h>
|
#include <esignal/Signal.h>
|
||||||
#include <ewol/event/Time.h>
|
#include <ewol/event/Time.h>
|
||||||
|
|
||||||
namespace ewol {
|
namespace ewol {
|
||||||
@ -74,7 +74,7 @@ namespace ewol {
|
|||||||
*/
|
*/
|
||||||
void workerRemove(const ewol::ObjectShared& _worker);
|
void workerRemove(const ewol::ObjectShared& _worker);
|
||||||
public:
|
public:
|
||||||
esignal::ISignal<ewol::event::Time> periodicCall;
|
esignal::Signal<ewol::event::Time> periodicCall;
|
||||||
private:
|
private:
|
||||||
int64_t m_applWakeUpTime; //!< Time of the application initialize
|
int64_t m_applWakeUpTime; //!< Time of the application initialize
|
||||||
int64_t m_lastPeriodicCallTime; //!< last call time ...
|
int64_t m_lastPeriodicCallTime; //!< last call time ...
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
#include <ewol/resource/Colored3DObject.h>
|
#include <ewol/resource/Colored3DObject.h>
|
||||||
#include <gale/resource/Manager.h>
|
#include <gale/resource/Manager.h>
|
||||||
#include <gale/renderer/openGL/openGL-include.h>
|
#include <gale/renderer/openGL/openGL-include.h>
|
||||||
#include <esignal/ISignal.h>
|
#include <esignal/Signal.h>
|
||||||
|
|
||||||
ewol::resource::Colored3DObject::Colored3DObject() :
|
ewol::resource::Colored3DObject::Colored3DObject() :
|
||||||
m_GLprogram(nullptr) {
|
m_GLprogram(nullptr) {
|
||||||
@ -229,11 +229,9 @@ namespace etk {
|
|||||||
return "!!ewol::resource::Colored3DObject!ERROR!CAN_NOT_BE_CONVERT!!";
|
return "!!ewol::resource::Colored3DObject!ERROR!CAN_NOT_BE_CONVERT!!";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#include <esignal/details/ISignal.hxx>
|
#include <esignal/details/Signal.hxx>
|
||||||
|
|
||||||
// declare for signal event
|
// declare for signal event
|
||||||
template class esignal::ISignal<ewol::resource::Colored3DObject>;
|
ESIGNAL_DECLARE_SIGNAL(ewol::resource::Colored3DObject);
|
||||||
template class esignal::ISignal<ememory::SharedPtr<ewol::resource::Colored3DObject>>;
|
ESIGNAL_DECLARE_SIGNAL(ememory::SharedPtr<ewol::resource::Colored3DObject>);
|
||||||
template class esignal::Signal<ewol::resource::Colored3DObject>;
|
|
||||||
template class esignal::Signal<ememory::SharedPtr<ewol::resource::Colored3DObject>>;
|
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
#include <ewol/compositing/Shaper.h>
|
#include <ewol/compositing/Shaper.h>
|
||||||
#include <ewol/widget/Container2.h>
|
#include <ewol/widget/Container2.h>
|
||||||
#include <ewol/widget/Manager.h>
|
#include <ewol/widget/Manager.h>
|
||||||
#include <esignal/ISignal.h>
|
#include <esignal/Signal.h>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -34,12 +34,12 @@ namespace ewol {
|
|||||||
lockAccess, //!< all event are trashed == > acctivity of the button is disable
|
lockAccess, //!< all event are trashed == > acctivity of the button is disable
|
||||||
};
|
};
|
||||||
public: // Event list
|
public: // Event list
|
||||||
esignal::ISignal<> signalPressed;
|
esignal::Signal<> signalPressed;
|
||||||
esignal::ISignal<> signalDown;
|
esignal::Signal<> signalDown;
|
||||||
esignal::ISignal<> signalUp;
|
esignal::Signal<> signalUp;
|
||||||
esignal::ISignal<> signalEnter;
|
esignal::Signal<> signalEnter;
|
||||||
esignal::ISignal<> signalLeave;
|
esignal::Signal<> signalLeave;
|
||||||
esignal::ISignal<bool> signalValue;
|
esignal::Signal<bool> signalValue;
|
||||||
public: // propertie list
|
public: // propertie list
|
||||||
eproperty::Value<std::string> propertyShape; //!< 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.
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
#include <ewol/compositing/Shaper.h>
|
#include <ewol/compositing/Shaper.h>
|
||||||
#include <ewol/widget/Widget.h>
|
#include <ewol/widget/Widget.h>
|
||||||
#include <ewol/widget/Manager.h>
|
#include <ewol/widget/Manager.h>
|
||||||
#include <esignal/ISignal.h>
|
#include <esignal/Signal.h>
|
||||||
|
|
||||||
namespace ewol {
|
namespace ewol {
|
||||||
namespace widget {
|
namespace widget {
|
||||||
@ -22,7 +22,7 @@ namespace ewol {
|
|||||||
using ButtonColorWeak = ememory::WeakPtr<ewol::widget::ButtonColor>;
|
using ButtonColorWeak = ememory::WeakPtr<ewol::widget::ButtonColor>;
|
||||||
class ButtonColor : public ewol::Widget {
|
class ButtonColor : public ewol::Widget {
|
||||||
public: // signals
|
public: // signals
|
||||||
esignal::ISignal<etk::Color<>> signalChange;
|
esignal::Signal<etk::Color<>> signalChange;
|
||||||
public: // properties
|
public: // properties
|
||||||
eproperty::Value<etk::Color<>> propertyValue; //!< Current color.
|
eproperty::Value<etk::Color<>> propertyValue; //!< Current color.
|
||||||
eproperty::Value<std::string> propertyShape; //!< Current color.
|
eproperty::Value<std::string> propertyShape; //!< Current color.
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
#include <ewol/compositing/Shaper.h>
|
#include <ewol/compositing/Shaper.h>
|
||||||
#include <ewol/widget/Container2.h>
|
#include <ewol/widget/Container2.h>
|
||||||
#include <ewol/widget/Manager.h>
|
#include <ewol/widget/Manager.h>
|
||||||
#include <esignal/ISignal.h>
|
#include <esignal/Signal.h>
|
||||||
|
|
||||||
|
|
||||||
namespace ewol {
|
namespace ewol {
|
||||||
@ -20,11 +20,11 @@ namespace ewol {
|
|||||||
using CheckBoxWeak = ememory::WeakPtr<ewol::widget::CheckBox>;
|
using CheckBoxWeak = ememory::WeakPtr<ewol::widget::CheckBox>;
|
||||||
class CheckBox : public ewol::widget::Container2 {
|
class CheckBox : public ewol::widget::Container2 {
|
||||||
public: // Event list
|
public: // Event list
|
||||||
esignal::ISignal<> signalPressed;
|
esignal::Signal<> signalPressed;
|
||||||
esignal::ISignal<> signalDown;
|
esignal::Signal<> signalDown;
|
||||||
esignal::ISignal<> signalUp;
|
esignal::Signal<> signalUp;
|
||||||
esignal::ISignal<> signalEnter;
|
esignal::Signal<> signalEnter;
|
||||||
esignal::ISignal<bool> signalValue;
|
esignal::Signal<bool> signalValue;
|
||||||
public: // propertie list
|
public: // propertie list
|
||||||
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
|
eproperty::Value<std::string> propertyShape; //!< shape of the widget
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
#include <etk/Color.h>
|
#include <etk/Color.h>
|
||||||
#include <ewol/widget/Widget.h>
|
#include <ewol/widget/Widget.h>
|
||||||
#include <ewol/compositing/Drawing.h>
|
#include <ewol/compositing/Drawing.h>
|
||||||
#include <esignal/ISignal.h>
|
#include <esignal/Signal.h>
|
||||||
|
|
||||||
|
|
||||||
namespace ewol {
|
namespace ewol {
|
||||||
@ -20,7 +20,7 @@ namespace ewol {
|
|||||||
using ColorBarWeak = ememory::WeakPtr<ewol::widget::ColorBar>;
|
using ColorBarWeak = ememory::WeakPtr<ewol::widget::ColorBar>;
|
||||||
class ColorBar : public ewol::Widget {
|
class ColorBar : public ewol::Widget {
|
||||||
public: // signals
|
public: // signals
|
||||||
esignal::ISignal<etk::Color<>> signalChange;
|
esignal::Signal<etk::Color<>> signalChange;
|
||||||
public:
|
public:
|
||||||
eproperty::Value<etk::Color<>> propertyValue;
|
eproperty::Value<etk::Color<>> propertyValue;
|
||||||
protected:
|
protected:
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
#include <ewol/widget/Widget.h>
|
#include <ewol/widget/Widget.h>
|
||||||
#include <etk/Color.h>
|
#include <etk/Color.h>
|
||||||
#include <ewol/widget/Manager.h>
|
#include <ewol/widget/Manager.h>
|
||||||
#include <esignal/ISignal.h>
|
#include <esignal/Signal.h>
|
||||||
|
|
||||||
namespace ewol {
|
namespace ewol {
|
||||||
namespace widget {
|
namespace widget {
|
||||||
@ -33,9 +33,9 @@ namespace ewol {
|
|||||||
*/
|
*/
|
||||||
class Entry : public ewol::Widget {
|
class Entry : public ewol::Widget {
|
||||||
public: // Event list
|
public: // Event list
|
||||||
esignal::ISignal<> signalClick; //!< bang on click the entry box
|
esignal::Signal<> signalClick; //!< bang on click the entry box
|
||||||
esignal::ISignal<std::string> signalEnter; //!< Enter key is pressed
|
esignal::Signal<std::string> signalEnter; //!< Enter key is pressed
|
||||||
esignal::ISignal<std::string> signalModify; //!< data change
|
esignal::Signal<std::string> signalModify; //!< data change
|
||||||
public: // propertie list
|
public: // propertie list
|
||||||
eproperty::Value<std::string> propertyShape;
|
eproperty::Value<std::string> propertyShape;
|
||||||
eproperty::Value<std::string> propertyValue; //!< string that must be displayed
|
eproperty::Value<std::string> propertyValue; //!< string that must be displayed
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
#include <ewol/compositing/Image.h>
|
#include <ewol/compositing/Image.h>
|
||||||
#include <ewol/resource/ColorFile.h>
|
#include <ewol/resource/ColorFile.h>
|
||||||
#include <ewol/widget/Manager.h>
|
#include <ewol/widget/Manager.h>
|
||||||
#include <esignal/ISignal.h>
|
#include <esignal/Signal.h>
|
||||||
|
|
||||||
namespace ewol {
|
namespace ewol {
|
||||||
namespace widget {
|
namespace widget {
|
||||||
@ -23,7 +23,7 @@ namespace ewol {
|
|||||||
*/
|
*/
|
||||||
class Image :public ewol::Widget {
|
class Image :public ewol::Widget {
|
||||||
public: // signals
|
public: // signals
|
||||||
esignal::ISignal<> signalPressed;
|
esignal::Signal<> signalPressed;
|
||||||
public: // properties
|
public: // properties
|
||||||
eproperty::Value<std::string> propertySource; //!< file name of the image.
|
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> propertyBorder; //!< border to add at the image.
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
#include <etk/Color.h>
|
#include <etk/Color.h>
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/widget/Widget.h>
|
#include <ewol/widget/Widget.h>
|
||||||
#include <esignal/ISignal.h>
|
#include <esignal/Signal.h>
|
||||||
|
|
||||||
// TODO : Rework ==> use property and shaper ...
|
// TODO : Rework ==> use property and shaper ...
|
||||||
|
|
||||||
@ -24,9 +24,9 @@ namespace ewol {
|
|||||||
class Joystick :public ewol::Widget {
|
class Joystick :public ewol::Widget {
|
||||||
public:
|
public:
|
||||||
// Event list of properties
|
// Event list of properties
|
||||||
esignal::ISignal<> signalEnable;
|
esignal::Signal<> signalEnable;
|
||||||
esignal::ISignal<> signalDisable;
|
esignal::Signal<> signalDisable;
|
||||||
esignal::ISignal<vec2> signalMove;
|
esignal::Signal<vec2> signalMove;
|
||||||
public:
|
public:
|
||||||
enum joystickMode {
|
enum joystickMode {
|
||||||
modeNormal,
|
modeNormal,
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
#include <ewol/widget/Widget.h>
|
#include <ewol/widget/Widget.h>
|
||||||
#include <ewol/widget/Manager.h>
|
#include <ewol/widget/Manager.h>
|
||||||
#include <ewol/resource/ColorFile.h>
|
#include <ewol/resource/ColorFile.h>
|
||||||
#include <esignal/ISignal.h>
|
#include <esignal/Signal.h>
|
||||||
|
|
||||||
namespace ewol {
|
namespace ewol {
|
||||||
namespace widget {
|
namespace widget {
|
||||||
@ -23,7 +23,7 @@ namespace ewol {
|
|||||||
*/
|
*/
|
||||||
class Label : public ewol::Widget {
|
class Label : public ewol::Widget {
|
||||||
public: // signals
|
public: // signals
|
||||||
esignal::ISignal<> signalPressed;
|
esignal::Signal<> signalPressed;
|
||||||
public: // properties
|
public: // properties
|
||||||
eproperty::Value<bool> propertyAutoTranslate; //!< if at true the data is translate automaticaly translate.
|
eproperty::Value<bool> propertyAutoTranslate; //!< if at true the data is translate automaticaly translate.
|
||||||
eproperty::Value<std::string> propertyValue; //!< decorated text to display.
|
eproperty::Value<std::string> propertyValue; //!< decorated text to display.
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
#include <ewol/widget/List.h>
|
#include <ewol/widget/List.h>
|
||||||
#include <etk/os/FSNode.h>
|
#include <etk/os/FSNode.h>
|
||||||
#include <ewol/resource/ColorFile.h>
|
#include <ewol/resource/ColorFile.h>
|
||||||
#include <esignal/ISignal.h>
|
#include <esignal/Signal.h>
|
||||||
|
|
||||||
namespace ewol {
|
namespace ewol {
|
||||||
namespace widget {
|
namespace widget {
|
||||||
@ -20,10 +20,10 @@ namespace ewol {
|
|||||||
*/
|
*/
|
||||||
class ListFileSystem : public ewol::widget::List {
|
class ListFileSystem : public ewol::widget::List {
|
||||||
public: // signals
|
public: // signals
|
||||||
esignal::ISignal<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::ISignal<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::ISignal<std::string> signalFolderSelect;
|
esignal::Signal<std::string> signalFolderSelect;
|
||||||
esignal::ISignal<std::string> signalFolderValidate;
|
esignal::Signal<std::string> signalFolderValidate;
|
||||||
public: // properties
|
public: // properties
|
||||||
eproperty::Value<std::string> propertyPath; //!< Current folder that display point on.
|
eproperty::Value<std::string> propertyPath; //!< Current folder that display point on.
|
||||||
eproperty::Value<std::string> propertyFile; //!< current selected file
|
eproperty::Value<std::string> propertyFile; //!< current selected file
|
||||||
|
@ -33,7 +33,7 @@ namespace ewol {
|
|||||||
*/
|
*/
|
||||||
class Menu :public ewol::widget::Sizer {
|
class Menu :public ewol::widget::Sizer {
|
||||||
public:
|
public:
|
||||||
esignal::ISignal<std::string> signalSelect; // event on a menu button or ...
|
esignal::Signal<std::string> signalSelect; // event on a menu button or ...
|
||||||
protected:
|
protected:
|
||||||
Menu();
|
Menu();
|
||||||
public:
|
public:
|
||||||
|
@ -148,6 +148,9 @@ bool ewol::widget::PopUp::onEventInput(const ewol::event::Input& _event) {
|
|||||||
if (_event.getId() == 0) {
|
if (_event.getId() == 0) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if (_event.getStatus() == gale::key::status::move) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
if (*propertyCloseOutEvent == true) {
|
if (*propertyCloseOutEvent == true) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -20,7 +20,7 @@ namespace ewol {
|
|||||||
*/
|
*/
|
||||||
class Select : public ewol::widget::SpinBase {
|
class Select : public ewol::widget::SpinBase {
|
||||||
public: // signals
|
public: // signals
|
||||||
esignal::ISignal<int32_t> signalValue;
|
esignal::Signal<int32_t> signalValue;
|
||||||
public: // properties
|
public: // properties
|
||||||
eproperty::Value<int32_t> propertyValue; //!< Current state of the Select.
|
eproperty::Value<int32_t> propertyValue; //!< Current state of the Select.
|
||||||
protected:
|
protected:
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/widget/Widget.h>
|
#include <ewol/widget/Widget.h>
|
||||||
#include <ewol/compositing/Drawing.h>
|
#include <ewol/compositing/Drawing.h>
|
||||||
#include <esignal/ISignal.h>
|
#include <esignal/Signal.h>
|
||||||
|
|
||||||
namespace ewol {
|
namespace ewol {
|
||||||
namespace widget {
|
namespace widget {
|
||||||
@ -22,7 +22,7 @@ namespace ewol {
|
|||||||
*/
|
*/
|
||||||
class Slider : public ewol::Widget {
|
class Slider : public ewol::Widget {
|
||||||
public: // signals
|
public: // signals
|
||||||
esignal::ISignal<float> signalChange;
|
esignal::Signal<float> signalChange;
|
||||||
public:
|
public:
|
||||||
//eproperty::Value<std::string> propertyShape; //!< name of the shape used
|
//eproperty::Value<std::string> propertyShape; //!< name of the shape used
|
||||||
eproperty::Value<float> propertyValue; //!< current value of the Slider
|
eproperty::Value<float> propertyValue; //!< current value of the Slider
|
||||||
|
@ -21,8 +21,8 @@ namespace ewol {
|
|||||||
class Spin : public ewol::widget::SpinBase {
|
class Spin : public ewol::widget::SpinBase {
|
||||||
public:
|
public:
|
||||||
// Event list of properties
|
// Event list of properties
|
||||||
esignal::ISignal<int64_t> signalValue;
|
esignal::Signal<int64_t> signalValue;
|
||||||
esignal::ISignal<double> signalValueDouble;
|
esignal::Signal<double> signalValueDouble;
|
||||||
public:
|
public:
|
||||||
eproperty::Value<int64_t> propertyValue; //!< Current value of the Spin.
|
eproperty::Value<int64_t> propertyValue; //!< Current value of the Spin.
|
||||||
eproperty::Value<int64_t> propertyMin; //!< Minimum value
|
eproperty::Value<int64_t> propertyMin; //!< Minimum value
|
||||||
|
@ -23,13 +23,15 @@ ewol::widget::WSlider::WSlider() :
|
|||||||
signalStopSlide(this, "stop", ""),
|
signalStopSlide(this, "stop", ""),
|
||||||
propertyTransitionSpeed(this, "speed",
|
propertyTransitionSpeed(this, "speed",
|
||||||
1.0f, 0.0f, 200.0f,
|
1.0f, 0.0f, 200.0f,
|
||||||
"Transition speed of the slider",
|
"Transition speed of the slider"),
|
||||||
&ewol::widget::WSlider::onChangePropertySelectWidget),
|
|
||||||
propertyTransitionMode(this, "mode",
|
propertyTransitionMode(this, "mode",
|
||||||
sladingTransitionHori,
|
sladingTransitionHori,
|
||||||
"Transition mode of the slider",
|
"Transition mode of the slider",
|
||||||
&ewol::widget::WSlider::onChangePropertyTransitionMode),
|
&ewol::widget::WSlider::onChangePropertyTransitionMode),
|
||||||
propertySelectWidget(this, "select", "", "Select the requested widget to display"),
|
propertySelectWidget(this, "select",
|
||||||
|
"",
|
||||||
|
"Select the requested widget to display",
|
||||||
|
&ewol::widget::WSlider::onChangePropertySelectWidget),
|
||||||
m_windowsSources(0),
|
m_windowsSources(0),
|
||||||
m_windowsDestination(0),
|
m_windowsDestination(0),
|
||||||
m_windowsRequested(-1),
|
m_windowsRequested(-1),
|
||||||
@ -163,6 +165,7 @@ void ewol::widget::WSlider::subWidgetSelectSet(const std::string& _widgetName) {
|
|||||||
EWOL_ERROR("Can not change to a widget with no name (input)");
|
EWOL_ERROR("Can not change to a widget with no name (input)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
EWOL_VERBOSE("Select a new sub-widget to dosplay : '" << _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
|
||||||
@ -178,6 +181,7 @@ void ewol::widget::WSlider::subWidgetSelectSet(const std::string& _widgetName) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void ewol::widget::WSlider::periodicCall(const ewol::event::Time& _event) {
|
void ewol::widget::WSlider::periodicCall(const ewol::event::Time& _event) {
|
||||||
|
EWOL_VERBOSE("Periodic: " << m_slidingProgress << "/1.0 " << m_windowsSources << " ==> " << m_windowsDestination);
|
||||||
if (m_slidingProgress >= 1.0) {
|
if (m_slidingProgress >= 1.0) {
|
||||||
m_windowsSources = m_windowsDestination;
|
m_windowsSources = m_windowsDestination;
|
||||||
if( m_windowsRequested != -1
|
if( m_windowsRequested != -1
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/widget/ContainerN.h>
|
#include <ewol/widget/ContainerN.h>
|
||||||
#include <ewol/widget/Manager.h>
|
#include <ewol/widget/Manager.h>
|
||||||
#include <esignal/ISignal.h>
|
#include <esignal/Signal.h>
|
||||||
|
|
||||||
namespace ewol {
|
namespace ewol {
|
||||||
namespace widget {
|
namespace widget {
|
||||||
@ -27,8 +27,8 @@ namespace ewol {
|
|||||||
sladingTransition_count,
|
sladingTransition_count,
|
||||||
};
|
};
|
||||||
public: // signals:
|
public: // signals:
|
||||||
esignal::ISignal<> signalStartSlide;
|
esignal::Signal<> signalStartSlide;
|
||||||
esignal::ISignal<> signalStopSlide;
|
esignal::Signal<> signalStopSlide;
|
||||||
public: // properties:
|
public: // properties:
|
||||||
eproperty::Range<float> propertyTransitionSpeed; //!< speed of the transition (default 1 == > 1s)
|
eproperty::Range<float> propertyTransitionSpeed; //!< speed of the transition (default 1 == > 1s)
|
||||||
eproperty::List<enum sladingMode> propertyTransitionMode; //!< mode to slide the widgets
|
eproperty::List<enum sladingMode> propertyTransitionMode; //!< mode to slide the widgets
|
||||||
|
@ -30,7 +30,7 @@ namespace ewol {
|
|||||||
#include <ewol/event/Entry.h>
|
#include <ewol/event/Entry.h>
|
||||||
#include <ewol/event/Time.h>
|
#include <ewol/event/Time.h>
|
||||||
#include <ewol/translate.h>
|
#include <ewol/translate.h>
|
||||||
#include <esignal/ISignal.h>
|
#include <esignal/Signal.h>
|
||||||
#include <ewol/DrawProperty.h>
|
#include <ewol/DrawProperty.h>
|
||||||
#include <ewol/gravity.h>
|
#include <ewol/gravity.h>
|
||||||
|
|
||||||
@ -408,7 +408,7 @@ namespace ewol {
|
|||||||
// -- Shortcut : management of the shortcut
|
// -- Shortcut : management of the shortcut
|
||||||
// ----------------------------------------------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------------------------------------------
|
||||||
public:
|
public:
|
||||||
esignal::ISignal<std::string> signalShortcut; //!< signal handle of the message
|
esignal::Signal<std::string> signalShortcut; //!< signal handle of the message
|
||||||
private:
|
private:
|
||||||
std::vector<EventShortCut*> m_localShortcut; //!< list of all shortcut in the widget
|
std::vector<EventShortCut*> m_localShortcut; //!< list of all shortcut in the widget
|
||||||
protected:
|
protected:
|
||||||
@ -532,9 +532,9 @@ namespace ewol {
|
|||||||
*/
|
*/
|
||||||
public:
|
public:
|
||||||
// event generated :
|
// event generated :
|
||||||
esignal::ISignal<> signalAnnimationStart; //!< event when start annimation
|
esignal::Signal<> signalAnnimationStart; //!< event when start annimation
|
||||||
esignal::ISignal<float> signalAnnimationRatio; //!< event when % of annimation change (integer)
|
esignal::Signal<float> signalAnnimationRatio; //!< event when % of annimation change (integer)
|
||||||
esignal::ISignal<> signalAnnimationStop; //!< event when stop annimation
|
esignal::Signal<> signalAnnimationStop; //!< event when stop annimation
|
||||||
protected:
|
protected:
|
||||||
enum annimationMode {
|
enum annimationMode {
|
||||||
annimationModeEnableAdd,
|
annimationModeEnableAdd,
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
#include <ewol/widget/Sizer.h>
|
#include <ewol/widget/Sizer.h>
|
||||||
#include <ewol/widget/ColorBar.h>
|
#include <ewol/widget/ColorBar.h>
|
||||||
#include <ewol/widget/Slider.h>
|
#include <ewol/widget/Slider.h>
|
||||||
#include <esignal/ISignal.h>
|
#include <esignal/Signal.h>
|
||||||
|
|
||||||
namespace ewol {
|
namespace ewol {
|
||||||
namespace widget {
|
namespace widget {
|
||||||
@ -26,7 +26,7 @@ namespace ewol {
|
|||||||
*/
|
*/
|
||||||
class ColorChooser : public ewol::widget::Sizer {
|
class ColorChooser : public ewol::widget::Sizer {
|
||||||
public: // signals
|
public: // signals
|
||||||
esignal::ISignal<etk::Color<>> signalChange;
|
esignal::Signal<etk::Color<>> signalChange;
|
||||||
public:
|
public:
|
||||||
eproperty::Value<etk::Color<>> propertyValue;
|
eproperty::Value<etk::Color<>> propertyValue;
|
||||||
protected:
|
protected:
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
#include <etk/types.h>
|
#include <etk/types.h>
|
||||||
#include <ewol/debug.h>
|
#include <ewol/debug.h>
|
||||||
#include <ewol/widget/Composer.h>
|
#include <ewol/widget/Composer.h>
|
||||||
#include <esignal/ISignal.h>
|
#include <esignal/Signal.h>
|
||||||
|
|
||||||
namespace ewol {
|
namespace ewol {
|
||||||
namespace widget {
|
namespace widget {
|
||||||
@ -65,8 +65,8 @@ namespace ewol {
|
|||||||
*/
|
*/
|
||||||
class FileChooser : public ewol::widget::Composer {
|
class FileChooser : public ewol::widget::Composer {
|
||||||
public: // signals
|
public: // signals
|
||||||
esignal::ISignal<> signalCancel; //!< abort the display of the pop-up or press cancel button
|
esignal::Signal<> signalCancel; //!< abort the display of the pop-up or press cancel button
|
||||||
esignal::ISignal<std::string> signalValidate; //!< select file(s)
|
esignal::Signal<std::string> signalValidate; //!< select file(s)
|
||||||
public: // properties
|
public: // properties
|
||||||
eproperty::Value<std::string> propertyPath; //!< Current path to explore
|
eproperty::Value<std::string> propertyPath; //!< Current path to explore
|
||||||
eproperty::Value<std::string> propertyFile; //!< Selected file
|
eproperty::Value<std::string> propertyFile; //!< Selected file
|
||||||
|
@ -27,7 +27,7 @@ namespace ewol {
|
|||||||
*/
|
*/
|
||||||
class Parameter : public ewol::widget::PopUp {
|
class Parameter : public ewol::widget::PopUp {
|
||||||
public: // signals
|
public: // signals
|
||||||
esignal::ISignal<> signalClose;
|
esignal::Signal<> signalClose;
|
||||||
public: // properties
|
public: // properties
|
||||||
eproperty::Value<std::string> propertyLabelTitle;
|
eproperty::Value<std::string> propertyLabelTitle;
|
||||||
protected:
|
protected:
|
||||||
|
@ -35,7 +35,7 @@ namespace ewol {
|
|||||||
*/
|
*/
|
||||||
class ParameterList :public ewol::widget::WidgetScrolled {
|
class ParameterList :public ewol::widget::WidgetScrolled {
|
||||||
public: //signals
|
public: //signals
|
||||||
esignal::ISignal<int32_t> signalSelect;
|
esignal::Signal<int32_t> signalSelect;
|
||||||
public: // properties
|
public: // properties
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user