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

[DEV] update new ememory::SharedPtr

Browse Source
This commit is contained in:
Edouard DUPIN 2016-07-15 21:22:11 +02:00
parent 88382c2564
commit 0d94650b4b
57 changed files with 141 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ewol/compositing/Area.cpp
View File

@ -31,7 +31,7 @@ void ewol::compositing::Area::loadProgram() {
// get the shader resource : // get the shader resource :
m_GLPosition = 0; m_GLPosition = 0;
m_GLprogram = gale::resource::Program::create(std::string("{ewol}DATA:textured3D.prog")); m_GLprogram = gale::resource::Program::create(std::string("{ewol}DATA:textured3D.prog"));
if (nullptr != m_GLprogram) { if (m_GLprogram != nullptr) {
m_GLPosition = m_GLprogram->getAttribute("EW_coord3d"); m_GLPosition = m_GLprogram->getAttribute("EW_coord3d");
m_GLColor = m_GLprogram->getAttribute("EW_color"); m_GLColor = m_GLprogram->getAttribute("EW_color");
m_GLtexture = m_GLprogram->getAttribute("EW_texture2d"); m_GLtexture = m_GLprogram->getAttribute("EW_texture2d");

5
ewol/compositing/Area.h
View File

@ -11,6 +11,7 @@
#include <gale/resource/Program.h> #include <gale/resource/Program.h>
#include <ewol/resource/Texture.h> #include <ewol/resource/Texture.h>
#include <egami/Image.h> #include <egami/Image.h>
#include <ememory/memory.h>
namespace ewol { namespace ewol {
namespace compositing { namespace compositing {
@ -19,14 +20,14 @@ namespace ewol {
vec3 m_position; //!< The current position to draw vec3 m_position; //!< The current position to draw
etk::Color<> m_color; //!< The text foreground color etk::Color<> m_color; //!< The text foreground color
private: private:
std::shared_ptr<gale::resource::Program> m_GLprogram; //!< pointer on the opengl display program ememory::SharedPtr<gale::resource::Program> m_GLprogram; //!< pointer on the opengl display program
int32_t m_GLPosition; //!< openGL id on the element (vertex buffer) int32_t m_GLPosition; //!< openGL id on the element (vertex buffer)
int32_t m_GLMatrix; //!< openGL id on the element (transformation matrix) int32_t m_GLMatrix; //!< openGL id on the element (transformation matrix)
int32_t m_GLColor; //!< openGL id on the element (color buffer) int32_t m_GLColor; //!< openGL id on the element (color buffer)
int32_t m_GLtexture; //!< openGL id on the element (Texture position) int32_t m_GLtexture; //!< openGL id on the element (Texture position)
int32_t m_GLtexID; //!< openGL id on the element (texture ID) int32_t m_GLtexID; //!< openGL id on the element (texture ID)
private: private:
std::shared_ptr<ewol::resource::Texture> m_resource; //!< texture resources ememory::SharedPtr<ewol::resource::Texture> m_resource; //!< texture resources
std::vector<vec3 > m_coord; //!< internal coord of the object std::vector<vec3 > m_coord; //!< internal coord of the object
std::vector<vec2 > m_coordTex; //!< internal texture coordinate for every point std::vector<vec2 > m_coordTex; //!< internal texture coordinate for every point
std::vector<etk::Color<float> > m_coordColor; //!< internal color of the different point std::vector<etk::Color<float> > m_coordColor; //!< internal color of the different point

2
ewol/compositing/Drawing.cpp
View File

@ -285,7 +285,7 @@ void ewol::compositing::Drawing::loadProgram() {
// oad the new ... // oad the new ...
m_GLprogram = gale::resource::Program::create("{ewol}DATA:color3.prog"); m_GLprogram = gale::resource::Program::create("{ewol}DATA:color3.prog");
// get the shader resource : // get the shader resource :
if (nullptr != m_GLprogram ) { if (m_GLprogram != nullptr) {
m_GLPosition = m_GLprogram->getAttribute("EW_coord3d"); m_GLPosition = m_GLprogram->getAttribute("EW_coord3d");
m_GLColor = m_GLprogram->getAttribute("EW_color"); m_GLColor = m_GLprogram->getAttribute("EW_color");
m_GLMatrix = m_GLprogram->getUniform("EW_MatrixTransformation"); m_GLMatrix = m_GLprogram->getUniform("EW_MatrixTransformation");

2
ewol/compositing/Drawing.h
View File

@ -24,7 +24,7 @@ namespace ewol {
etk::Color<> m_color; //!< The text foreground color etk::Color<> m_color; //!< The text foreground color
etk::Color<> m_colorBg; //!< The text background color etk::Color<> m_colorBg; //!< The text background color
private: private:
std::shared_ptr<gale::resource::Program> m_GLprogram; //!< pointer on the opengl display program ememory::SharedPtr<gale::resource::Program> m_GLprogram; //!< pointer on the opengl display program
int32_t m_GLPosition; //!< openGL id on the element (vertex buffer) int32_t m_GLPosition; //!< openGL id on the element (vertex buffer)
int32_t m_GLMatrix; //!< openGL id on the element (transformation matrix) int32_t m_GLMatrix; //!< openGL id on the element (transformation matrix)
int32_t m_GLMatrixPosition; //!< position matrix int32_t m_GLMatrixPosition; //!< position matrix

4
ewol/compositing/Image.cpp
View File

@ -246,8 +246,8 @@ void ewol::compositing::Image::printPart(const vec2& _size,
void ewol::compositing::Image::setSource(const std::string& _newFile, const vec2& _size) { void ewol::compositing::Image::setSource(const std::string& _newFile, const vec2& _size) {
clear(); clear();
std::shared_ptr<ewol::resource::TextureFile> resource = m_resource; ememory::SharedPtr<ewol::resource::TextureFile> resource = m_resource;
std::shared_ptr<ewol::resource::ImageDF> resourceDF = m_resourceDF; ememory::SharedPtr<ewol::resource::ImageDF> resourceDF = m_resourceDF;
m_filename = _newFile; m_filename = _newFile;
m_requestSize = _size; m_requestSize = _size;
m_resource.reset(); m_resource.reset();

6
ewol/compositing/Image.h
View File

@ -27,7 +27,7 @@ namespace ewol {
etk::Color<> m_color; //!< The text foreground color etk::Color<> m_color; //!< The text foreground color
float m_angle; //!< Angle to set at the axes float m_angle; //!< Angle to set at the axes
private: private:
std::shared_ptr<gale::resource::Program> m_GLprogram; //!< pointer on the opengl display program ememory::SharedPtr<gale::resource::Program> m_GLprogram; //!< pointer on the opengl display program
int32_t m_GLPosition; //!< openGL id on the element (vertex buffer) int32_t m_GLPosition; //!< openGL id on the element (vertex buffer)
int32_t m_GLMatrix; //!< openGL id on the element (transformation matrix) int32_t m_GLMatrix; //!< openGL id on the element (transformation matrix)
int32_t m_GLColor; //!< openGL id on the element (color buffer) int32_t m_GLColor; //!< openGL id on the element (color buffer)
@ -35,8 +35,8 @@ namespace ewol {
int32_t m_GLtexID; //!< openGL id on the element (texture ID) int32_t m_GLtexID; //!< openGL id on the element (texture ID)
private: private:
bool m_distanceFieldMode; //!< select distance field mode bool m_distanceFieldMode; //!< select distance field mode
std::shared_ptr<ewol::resource::TextureFile> m_resource; //!< texture resources ememory::SharedPtr<ewol::resource::TextureFile> m_resource; //!< texture resources
std::shared_ptr<ewol::resource::ImageDF> m_resourceDF; //!< texture resources ememory::SharedPtr<ewol::resource::ImageDF> m_resourceDF; //!< texture resources
std::vector<vec3 > m_coord; //!< internal coord of the object std::vector<vec3 > m_coord; //!< internal coord of the object
std::vector<vec2 > m_coordTex; //!< internal texture coordinate for every point std::vector<vec2 > m_coordTex; //!< internal texture coordinate for every point
std::vector<etk::Color<float> > m_coordColor; //!< internal color of the different point std::vector<etk::Color<float> > m_coordColor; //!< internal color of the different point

2
ewol/compositing/Shaper.cpp
View File

@ -192,7 +192,7 @@ void ewol::compositing::Shaper::draw(bool _disableDepthTest) {
for (auto element : m_listAssiciatedId) { for (auto element : m_listAssiciatedId) {
m_GLprogram->uniform(element.x(), m_colorProperty->get(element.y())); m_GLprogram->uniform(element.x(), m_colorProperty->get(element.y()));
} }
if (nullptr!=m_resourceTexture) { if (m_resourceTexture != nullptr) {
// TextureID // TextureID
m_GLprogram->setTexture0(m_GLtexID, m_resourceTexture->getRendererId()); m_GLprogram->setTexture0(m_GLtexID, m_resourceTexture->getRendererId());
} }

8
ewol/compositing/Shaper.h
View File

@ -40,7 +40,7 @@ namespace ewol {
private: private:
std::string m_name; //!< Name of the configuration of the shaper. std::string m_name; //!< Name of the configuration of the shaper.
// External theme config: // External theme config:
std::shared_ptr<ewol::resource::ConfigFile> m_config; //!< pointer on the config file resources ememory::SharedPtr<ewol::resource::ConfigFile> m_config; //!< pointer on the config file resources
int32_t m_confIdPaddingOut[shaperPosCount]; //!< Padding out property : X-left X-right Y-top Y-buttom int32_t m_confIdPaddingOut[shaperPosCount]; //!< Padding out property : X-left X-right Y-top Y-buttom
int32_t m_confIdBorder[shaperPosCount]; //!< border property : X-left X-right Y-top Y-buttom int32_t m_confIdBorder[shaperPosCount]; //!< border property : X-left X-right Y-top Y-buttom
int32_t m_confIdPaddingIn[shaperPosCount]; //!< Padding in property : X-left X-right Y-top Y-buttom int32_t m_confIdPaddingIn[shaperPosCount]; //!< Padding in property : X-left X-right Y-top Y-buttom
@ -51,7 +51,7 @@ namespace ewol {
int32_t m_confColorFile; //!< ConfigFile opengGl color file Name int32_t m_confColorFile; //!< ConfigFile opengGl color file Name
int32_t m_confImageFile; //!< ConfigFile opengGl program Name int32_t m_confImageFile; //!< ConfigFile opengGl program Name
// openGL shaders programs: // openGL shaders programs:
std::shared_ptr<gale::resource::Program> m_GLprogram; //!< pointer on the opengl display program ememory::SharedPtr<gale::resource::Program> m_GLprogram; //!< pointer on the opengl display program
int32_t m_GLPosition; //!< openGL id on the element (vertex buffer) int32_t m_GLPosition; //!< openGL id on the element (vertex buffer)
int32_t m_GLMatrix; //!< openGL id on the element (transformation matrix) int32_t m_GLMatrix; //!< openGL id on the element (transformation matrix)
int32_t m_GLPropertyPos; //!< openGL id on the element (simple ratio position in the widget : ____/-----\_____ on vec2(X,Y)) int32_t m_GLPropertyPos; //!< openGL id on the element (simple ratio position in the widget : ____/-----\_____ on vec2(X,Y))
@ -61,7 +61,7 @@ namespace ewol {
int32_t m_GLStateTransition; //!< openGL id on the element (transition ofset [0.0..1.0] ) int32_t m_GLStateTransition; //!< openGL id on the element (transition ofset [0.0..1.0] )
int32_t m_GLtexID; //!< openGL id on the element (texture image) int32_t m_GLtexID; //!< openGL id on the element (texture image)
// For the Image : // For the Image :
std::shared_ptr<ewol::resource::TextureFile> m_resourceTexture; //!< texture resources (for the image) ememory::SharedPtr<ewol::resource::TextureFile> m_resourceTexture; //!< texture resources (for the image)
// internal needed data : // internal needed data :
int32_t m_nextStatusRequested; //!< when status is changing, this represent the next step of it int32_t m_nextStatusRequested; //!< when status is changing, this represent the next step of it
vec2 m_propertyOrigin; //!< widget origin vec2 m_propertyOrigin; //!< widget origin
@ -76,7 +76,7 @@ namespace ewol {
vec2 m_pos[SHAPER_NB_MAX_VERTEX]; //!< podition to display property vec2 m_pos[SHAPER_NB_MAX_VERTEX]; //!< podition to display property
int32_t m_nbVertexToDisplay; int32_t m_nbVertexToDisplay;
// color management theme: // color management theme:
std::shared_ptr<ewol::resource::ColorFile> m_colorProperty; //!< input resource for color management ememory::SharedPtr<ewol::resource::ColorFile> m_colorProperty; //!< input resource for color management
std::vector<ivec2> m_listAssiciatedId; //!< Corellation ID between ColorProperty (Y) and OpenGL Program (X) std::vector<ivec2> m_listAssiciatedId; //!< Corellation ID between ColorProperty (Y) and OpenGL Program (X)
private: private:
/** /**

2
ewol/compositing/Text.cpp
View File

@ -144,7 +144,7 @@ void ewol::compositing::Text::setFontName(const std::string& _fontName) {
void ewol::compositing::Text::setFont(std::string _fontName, int32_t _fontSize) { void ewol::compositing::Text::setFont(std::string _fontName, int32_t _fontSize) {
clear(); clear();
// remove old one // remove old one
std::shared_ptr<ewol::resource::TexturedFont> previousFont = m_font; ememory::SharedPtr<ewol::resource::TexturedFont> previousFont = m_font;
if (_fontSize <= 0) { if (_fontSize <= 0) {
_fontSize = ewol::getContext().getFontDefault().getSize(); _fontSize = ewol::getContext().getFontDefault().getSize();
} }

2
ewol/compositing/Text.h
View File

@ -21,7 +21,7 @@ namespace ewol {
namespace compositing { namespace compositing {
class Text : public ewol::compositing::TextBase { class Text : public ewol::compositing::TextBase {
protected: protected:
std::shared_ptr<ewol::resource::TexturedFont> m_font; //!< Font resources ememory::SharedPtr<ewol::resource::TexturedFont> m_font; //!< Font resources
public: public:
/** /**
* @brief generic constructor * @brief generic constructor

2
ewol/compositing/TextBase.cpp
View File

@ -47,7 +47,7 @@ ewol::compositing::TextBase::~TextBase() {
void ewol::compositing::TextBase::loadProgram(const std::string& _shaderName) { void ewol::compositing::TextBase::loadProgram(const std::string& _shaderName) {
// get the shader resource : // get the shader resource :
m_GLPosition = 0; m_GLPosition = 0;
std::shared_ptr<gale::resource::Program> old = m_GLprogram; ememory::SharedPtr<gale::resource::Program> old = m_GLprogram;
m_GLprogram = gale::resource::Program::create(_shaderName); m_GLprogram = gale::resource::Program::create(_shaderName);
if (m_GLprogram != nullptr) { if (m_GLprogram != nullptr) {
m_GLPosition = m_GLprogram->getAttribute("EW_coord3d"); m_GLPosition = m_GLprogram->getAttribute("EW_coord3d");

2
ewol/compositing/TextBase.h
View File

@ -73,7 +73,7 @@ namespace ewol {
float m_stopTextPos; //!< end of the alignement (when a string is too hight it cut at the word previously this virtual line and the center is perform with this one) float m_stopTextPos; //!< end of the alignement (when a string is too hight it cut at the word previously this virtual line and the center is perform with this one)
enum aligneMode m_alignement; //!< Current Alignement mode (justify/left/right ...) enum aligneMode m_alignement; //!< Current Alignement mode (justify/left/right ...)
protected: protected:
std::shared_ptr<gale::resource::Program> m_GLprogram; //!< pointer on the opengl display program ememory::SharedPtr<gale::resource::Program> m_GLprogram; //!< pointer on the opengl display program
int32_t m_GLPosition; //!< openGL id on the element (vertex buffer) int32_t m_GLPosition; //!< openGL id on the element (vertex buffer)
int32_t m_GLMatrix; //!< openGL id on the element (transformation matrix) int32_t m_GLMatrix; //!< openGL id on the element (transformation matrix)
int32_t m_GLColor; //!< openGL id on the element (color buffer) int32_t m_GLColor; //!< openGL id on the element (color buffer)

2
ewol/compositing/TextDF.cpp
View File

@ -147,7 +147,7 @@ void ewol::compositing::TextDF::setFontSize(int32_t _fontSize) {
void ewol::compositing::TextDF::setFontName(const std::string& _fontName) { void ewol::compositing::TextDF::setFontName(const std::string& _fontName) {
clear(); clear();
// remove old one // remove old one
std::shared_ptr<ewol::resource::DistanceFieldFont> previousFont = m_fontDF; ememory::SharedPtr<ewol::resource::DistanceFieldFont> previousFont = m_fontDF;
std::string fontName; std::string fontName;
if (_fontName == "") { if (_fontName == "") {
fontName = ewol::getContext().getFontDefault().getName(); fontName = ewol::getContext().getFontDefault().getName();

2
ewol/compositing/TextDF.h
View File

@ -19,7 +19,7 @@ namespace ewol {
namespace compositing { namespace compositing {
class TextDF : public ewol::compositing::TextBase { class TextDF : public ewol::compositing::TextBase {
protected: protected:
std::shared_ptr<ewol::resource::DistanceFieldFont> m_fontDF; //!< Font resources ememory::SharedPtr<ewol::resource::DistanceFieldFont> m_fontDF; //!< Font resources
std::vector<float> m_glyphLevel; //!< Level of display of the glyph (notmal : 0.50, bold : 0.40, super bold : 0.30 ...) std::vector<float> m_glyphLevel; //!< Level of display of the glyph (notmal : 0.50, bold : 0.40, super bold : 0.30 ...)
protected: protected:
int32_t m_GLglyphLevel; //!< openGL Id on the glyph level display int32_t m_GLglyphLevel; //!< openGL Id on the glyph level display

20
ewol/context/Context.cpp
View File

@ -32,12 +32,12 @@
static ewol::Context* l_curentInterface=nullptr; static ewol::Context* l_curentInterface=nullptr;
ewol::Context& ewol::getContext() { ewol::Context& ewol::getContext() {
gale::Context& context = gale::getContext(); gale::Context& context = gale::getContext();
std::shared_ptr<gale::Application> appl = context.getApplication(); ememory::SharedPtr<gale::Application> appl = context.getApplication();
if (appl == nullptr) { if (appl == nullptr) {
EWOL_CRITICAL("[CRITICAL] try acces at an empty GALE application (can not get Context)"); EWOL_CRITICAL("[CRITICAL] try acces at an empty GALE application (can not get Context)");
// ??? // ???
} }
return *(std::static_pointer_cast<ewol::Context>(appl)); return *(ememory::staticPointerCast<ewol::Context>(appl));
} }
@ -100,7 +100,7 @@ void ewol::Context::onCreate(gale::Context& _context) {
forceOrientation(ewol::screenAuto); forceOrientation(ewol::screenAuto);
#endif #endif
*/ */
std::shared_ptr<ewol::context::Application> appl = m_application; ememory::SharedPtr<ewol::context::Application> appl = m_application;
if (appl == nullptr) { if (appl == nullptr) {
EWOL_ERROR(" == > Create without application"); EWOL_ERROR(" == > Create without application");
return; return;
@ -111,7 +111,7 @@ void ewol::Context::onCreate(gale::Context& _context) {
void ewol::Context::onStart(gale::Context& _context) { void ewol::Context::onStart(gale::Context& _context) {
EWOL_INFO(" == > Ewol system start (BEGIN)"); EWOL_INFO(" == > Ewol system start (BEGIN)");
std::shared_ptr<ewol::context::Application> appl = m_application; ememory::SharedPtr<ewol::context::Application> appl = m_application;
if (appl == nullptr) { if (appl == nullptr) {
// TODO : Request exit of the application .... with error ... // TODO : Request exit of the application .... with error ...
return; return;
@ -122,7 +122,7 @@ void ewol::Context::onStart(gale::Context& _context) {
void ewol::Context::onResume(gale::Context& _context) { void ewol::Context::onResume(gale::Context& _context) {
EWOL_INFO(" == > Ewol system resume (BEGIN)"); EWOL_INFO(" == > Ewol system resume (BEGIN)");
std::shared_ptr<ewol::context::Application> appl = m_application; ememory::SharedPtr<ewol::context::Application> appl = m_application;
if (appl == nullptr) { if (appl == nullptr) {
return; return;
} }
@ -160,7 +160,7 @@ void ewol::Context::onDraw(gale::Context& _context) {
void ewol::Context::onPause(gale::Context& _context) { void ewol::Context::onPause(gale::Context& _context) {
EWOL_INFO(" == > Ewol system pause (BEGIN)"); EWOL_INFO(" == > Ewol system pause (BEGIN)");
std::shared_ptr<ewol::context::Application> appl = m_application; ememory::SharedPtr<ewol::context::Application> appl = m_application;
if (appl == nullptr) { if (appl == nullptr) {
return; return;
} }
@ -170,7 +170,7 @@ void ewol::Context::onPause(gale::Context& _context) {
void ewol::Context::onStop(gale::Context& _context) { void ewol::Context::onStop(gale::Context& _context) {
EWOL_INFO(" == > Ewol system stop (BEGIN)"); EWOL_INFO(" == > Ewol system stop (BEGIN)");
std::shared_ptr<ewol::context::Application> appl = m_application; ememory::SharedPtr<ewol::context::Application> appl = m_application;
if (appl == nullptr) { if (appl == nullptr) {
return; return;
} }
@ -184,7 +184,7 @@ void ewol::Context::onDestroy(gale::Context& _context) {
m_windowsCurrent.reset(); m_windowsCurrent.reset();
// clean all widget and sub widget with their resources: // clean all widget and sub widget with their resources:
m_objectManager.cleanInternalRemoved(); m_objectManager.cleanInternalRemoved();
std::shared_ptr<ewol::context::Application> appl = m_application; ememory::SharedPtr<ewol::context::Application> appl = m_application;
if (appl != nullptr) { if (appl != nullptr) {
// call application to uninit // call application to uninit
appl->onDestroy(*this); appl->onDestroy(*this);
@ -201,7 +201,7 @@ void ewol::Context::onDestroy(gale::Context& _context) {
void ewol::Context::onKillDemand(gale::Context& _context) { void ewol::Context::onKillDemand(gale::Context& _context) {
EWOL_INFO(" == > User demand a destroy (BEGIN)"); EWOL_INFO(" == > User demand a destroy (BEGIN)");
std::shared_ptr<ewol::context::Application> appl = m_application; ememory::SharedPtr<ewol::context::Application> appl = m_application;
if (appl == nullptr) { if (appl == nullptr) {
exit(0); exit(0);
return; return;
@ -315,7 +315,7 @@ void ewol::Context::onClipboardEvent(enum gale::context::clipBoard::clipboardLis
ewol::Context::Context(ewol::context::Application* _application) : ewol::Context::Context(ewol::context::Application* _application) :
//m_application(std::make_shared<ewol::context::Application>(_application)), //m_application(ememory::makeShared<ewol::context::Application>(_application)),
m_application(_application), m_application(_application),
m_objectManager(*this), m_objectManager(*this),
m_input(*this), m_input(*this),

6
ewol/context/Context.h
View File

@ -19,15 +19,15 @@
#include <ewol/context/Application.h> #include <ewol/context/Application.h>
#include <ewol/context/ConfigFont.h> #include <ewol/context/ConfigFont.h>
#include <ewol/context/InputManager.h> #include <ewol/context/InputManager.h>
#include <memory> #include <ememory/memory.h>
namespace ewol { namespace ewol {
// Here we hereted from the gale application to be agnostic of the OW where we work ... // Here we hereted from the gale application to be agnostic of the OW where we work ...
class Context : public gale::Application { class Context : public gale::Application {
private: private:
std::shared_ptr<ewol::context::Application> m_application; //!< Application handle ememory::SharedPtr<ewol::context::Application> m_application; //!< Application handle
public: public:
std::shared_ptr<ewol::context::Application> getApplication() { ememory::SharedPtr<ewol::context::Application> getApplication() {
return m_application; return m_application;
} }
public: public:

6
ewol/object/Object.cpp
View File

@ -21,7 +21,7 @@ void ewol::Object::autoDestroy() {
// TODO : set a signal to do this ... // TODO : set a signal to do this ...
if (parent != nullptr) { if (parent != nullptr) {
EWOL_VERBOSE("Destroy object: Call parrent"); EWOL_VERBOSE("Destroy object: Call parrent");
parent->requestDestroyFromChild(shared_from_this()); parent->requestDestroyFromChild(sharedFromThis());
} }
//if no parent ==> noting to do ... //if no parent ==> noting to do ...
m_destroy = true; m_destroy = true;
@ -71,7 +71,7 @@ ewol::Object::~Object() {
void ewol::Object::init() { void ewol::Object::init() {
getObjectManager().add(shared_from_this()); getObjectManager().add(sharedFromThis());
//parameterDisplay(); //parameterDisplay();
m_objectHasBeenInit = true; m_objectHasBeenInit = true;
} }
@ -164,7 +164,7 @@ ewol::ObjectShared ewol::Object::getObjectNamed(const std::string& _objectName)
ewol::ObjectShared ewol::Object::getSubObjectNamed(const std::string& _objectName) { ewol::ObjectShared ewol::Object::getSubObjectNamed(const std::string& _objectName) {
EWOL_VERBOSE("check if name : " << _objectName << " ?= " << propertyName.get()); EWOL_VERBOSE("check if name : " << _objectName << " ?= " << propertyName.get());
if (_objectName == propertyName.get()) { if (_objectName == propertyName.get()) {
return shared_from_this(); return sharedFromThis();
} }
return nullptr; return nullptr;
} }

12
ewol/object/Object.h
View File

@ -9,7 +9,7 @@
#include <vector> #include <vector>
#include <exml/exml.h> #include <exml/exml.h>
#include <mutex> #include <mutex>
#include <memory> #include <ememory/memory.h>
#include <unordered_map> #include <unordered_map>
#include <ewol/debug.h> #include <ewol/debug.h>
@ -81,7 +81,7 @@ exit_on_error:
ememory::SharedPtr<className> object; \ ememory::SharedPtr<className> object; \
ememory::SharedPtr<ewol::Object> object2 = getObjectNamed(uniqueName); \ ememory::SharedPtr<ewol::Object> object2 = getObjectNamed(uniqueName); \
if (object2 != nullptr) { \ if (object2 != nullptr) { \
object = std::dynamic_pointer_cast<className>(object2); \ object = ememory::dynamicPointerCast<className>(object2); \
if (object == nullptr) { \ if (object == nullptr) { \
EWOL_CRITICAL("Request object element: '" << uniqueName << "' With the wrong type (dynamic cast error)"); \ EWOL_CRITICAL("Request object element: '" << uniqueName << "' With the wrong type (dynamic cast error)"); \
return nullptr; \ return nullptr; \
@ -282,7 +282,7 @@ namespace ewol {
* @brief link on an signal in the subwiget with his name * @brief link on an signal in the subwiget with his name
*/ */
#define subBind(_type, _name, _event, _shared_ptr, _func, ...) do {\ #define subBind(_type, _name, _event, _shared_ptr, _func, ...) do {\
ememory::SharedPtr<_type> myObject = std::dynamic_pointer_cast<_type>(getSubObjectNamed(_name)); \ ememory::SharedPtr<_type> myObject = ememory::dynamicPointerCast<_type>(getSubObjectNamed(_name)); \
if (myObject != nullptr) { \ if (myObject != nullptr) { \
myObject->_event.connect(_shared_ptr, _func, ##__VA_ARGS__); \ myObject->_event.connect(_shared_ptr, _func, ##__VA_ARGS__); \
} else { \ } else { \
@ -291,7 +291,7 @@ namespace ewol {
} while (false) } while (false)
/* /*
template<class TYPE> void subBind(ememory::SharedPtr<ewol::Object> _obj, void (TYPE::*_func)()) { template<class TYPE> void subBind(ememory::SharedPtr<ewol::Object> _obj, void (TYPE::*_func)()) {
ememory::SharedPtr<TYPE> obj2 = std::dynamic_pointer_cast<TYPE>(_obj); ememory::SharedPtr<TYPE> obj2 = ememory::dynamicPointerCast<TYPE>(_obj);
if (obj2 == nullptr) { if (obj2 == nullptr) {
EWOL_ERROR("Can not connect signal ..."); EWOL_ERROR("Can not connect signal ...");
return; return;
@ -307,7 +307,7 @@ namespace ewol {
* @brief link on an signal in the global object list with his name * @brief link on an signal in the global object list with his name
*/ */
#define globalBind(_type, _name, _event, _obj, _func, ...) do {\ #define globalBind(_type, _name, _event, _obj, _func, ...) do {\
ememory::SharedPtr<_type> myObject = std::dynamic_pointer_cast<_type>(ewol::getContext().getEObjectManager().getObjectNamed(_name)); \ ememory::SharedPtr<_type> myObject = ememory::dynamicPointerCast<_type>(ewol::getContext().getEObjectManager().getObjectNamed(_name)); \
if (myObject != nullptr) { \ if (myObject != nullptr) { \
myObject->_event.connect(_obj, _func, ##__VA_ARGS__); \ myObject->_event.connect(_obj, _func, ##__VA_ARGS__); \
} else { \ } else { \
@ -319,7 +319,7 @@ namespace ewol {
* @brief link on an signal in the subWidget of an object with his name * @brief link on an signal in the subWidget of an object with his name
*/ */
#define externSubBind(_object, _type, _name, _event, _obj, _func, ...) do {\ #define externSubBind(_object, _type, _name, _event, _obj, _func, ...) do {\
ememory::SharedPtr<_type> myObject = std::dynamic_pointer_cast<_type>(_object->getObjectNamed(_name)); \ ememory::SharedPtr<_type> myObject = ememory::dynamicPointerCast<_type>(_object->getObjectNamed(_name)); \
if (myObject != nullptr) { \ if (myObject != nullptr) { \
myObject->_event.connect(_obj, _func, ##__VA_ARGS__); \ myObject->_event.connect(_obj, _func, ##__VA_ARGS__); \
} else { \ } else { \

4
ewol/object/Worker.cpp
View File

@ -14,7 +14,7 @@ ewol::object::Worker::Worker() {
void ewol::object::Worker::init() { void ewol::object::Worker::init() {
ewol::Object::init(); ewol::Object::init();
getObjectManager().workerAdd(shared_from_this()); getObjectManager().workerAdd(sharedFromThis());
} }
ewol::object::Worker::~Worker() { ewol::object::Worker::~Worker() {
@ -23,5 +23,5 @@ ewol::object::Worker::~Worker() {
void ewol::object::Worker::destroy() { void ewol::object::Worker::destroy() {
ewol::Object::destroy(); ewol::Object::destroy();
getObjectManager().workerRemove(shared_from_this()); getObjectManager().workerRemove(sharedFromThis());
} }

4
ewol/resource/Colored3DObject.cpp
View File

@ -233,7 +233,7 @@ namespace etk {
// declare for signal event // declare for signal event
template class esignal::ISignal<ewol::resource::Colored3DObject>; template class esignal::ISignal<ewol::resource::Colored3DObject>;
template class esignal::ISignal<std::shared_ptr<ewol::resource::Colored3DObject>>; template class esignal::ISignal<ememory::SharedPtr<ewol::resource::Colored3DObject>>;
template class esignal::Signal<ewol::resource::Colored3DObject>; template class esignal::Signal<ewol::resource::Colored3DObject>;
template class esignal::Signal<std::shared_ptr<ewol::resource::Colored3DObject>>; template class esignal::Signal<ememory::SharedPtr<ewol::resource::Colored3DObject>>;

2
ewol/resource/Colored3DObject.h
View File

@ -14,7 +14,7 @@ namespace ewol {
namespace resource { namespace resource {
class Colored3DObject : public gale::Resource { class Colored3DObject : public gale::Resource {
protected: protected:
std::shared_ptr<gale::resource::Program> m_GLprogram; ememory::SharedPtr<gale::resource::Program> m_GLprogram;
int32_t m_GLPosition; int32_t m_GLPosition;
int32_t m_GLMatrix; int32_t m_GLMatrix;
int32_t m_GLColor; int32_t m_GLColor;

2
ewol/resource/ConfigFile.h
View File

@ -38,7 +38,7 @@ namespace ewol {
* @param[in] _filename Name of the configuration file. * @param[in] _filename Name of the configuration file.
* @return pointer on the resource or nullptr if an error occured. * @return pointer on the resource or nullptr if an error occured.
*/ */
static std::shared_ptr<ewol::resource::ConfigFile> keep(const std::string& _filename); static ememory::SharedPtr<ewol::resource::ConfigFile> keep(const std::string& _filename);
}; };
}; };
}; };

4
ewol/resource/DistanceFieldFont.h
View File

@ -18,7 +18,7 @@ namespace ewol {
// specific element to have the the know if the specify element is known... // specific element to have the the know if the specify element is known...
// == > otherwise I can just generate italic ... // == > otherwise I can just generate italic ...
// == > Bold is a little more complicated (maybe with the bordersize) // == > Bold is a little more complicated (maybe with the bordersize)
std::shared_ptr<ewol::resource::FontBase> m_font; ememory::SharedPtr<ewol::resource::FontBase> m_font;
public: public:
std::vector<GlyphProperty> m_listElement; std::vector<GlyphProperty> m_listElement;
private: private:
@ -68,7 +68,7 @@ namespace ewol {
* @param[in] _filename Name of the texture font. * @param[in] _filename Name of the texture font.
* @return pointer on the resource or nullptr if an error occured. * @return pointer on the resource or nullptr if an error occured.
*/ */
static std::shared_ptr<ewol::resource::DistanceFieldFont> keep(const std::string& _filename); static ememory::SharedPtr<ewol::resource::DistanceFieldFont> keep(const std::string& _filename);
private: private:
/** /**
* @brief add a glyph in a texture font. * @brief add a glyph in a texture font.

12
ewol/resource/Image.cpp
View File

@ -64,10 +64,10 @@ static int32_t nextP2(int32_t _value) {
std::shared_ptr<ewol::resource::TextureFile> ewol::resource::TextureFile::create(const std::string& _filename, ivec2 _size, ivec2 _sizeRegister) { ememory::SharedPtr<ewol::resource::TextureFile> ewol::resource::TextureFile::create(const std::string& _filename, ivec2 _size, ivec2 _sizeRegister) {
EWOL_VERBOSE("KEEP: TextureFile: '" << _filename << "' size=" << _size << " sizeRegister=" << _sizeRegister); EWOL_VERBOSE("KEEP: TextureFile: '" << _filename << "' size=" << _size << " sizeRegister=" << _sizeRegister);
if (_filename == "") { if (_filename == "") {
std::shared_ptr<ewol::resource::TextureFile> object(new ewol::resource::TextureFile()); ememory::SharedPtr<ewol::resource::TextureFile> object(new ewol::resource::TextureFile());
if (nullptr == object) { if (nullptr == object) {
EWOL_ERROR("allocation error of a resource : ??TEX??"); EWOL_ERROR("allocation error of a resource : ??TEX??");
return nullptr; return nullptr;
@ -108,10 +108,10 @@ std::shared_ptr<ewol::resource::TextureFile> ewol::resource::TextureFile::create
} }
EWOL_VERBOSE("KEEP: TextureFile: '" << tmpFilename << "' new size=" << _size); EWOL_VERBOSE("KEEP: TextureFile: '" << tmpFilename << "' new size=" << _size);
std::shared_ptr<ewol::resource::TextureFile> object = nullptr; ememory::SharedPtr<ewol::resource::TextureFile> object = nullptr;
std::shared_ptr<gale::Resource> object2 = getManager().localKeep(tmpFilename); ememory::SharedPtr<gale::Resource> object2 = getManager().localKeep(tmpFilename);
if (object2 != nullptr) { if (object2 != nullptr) {
object = std::dynamic_pointer_cast<ewol::resource::TextureFile>(object2); object = ememory::dynamicPointerCast<ewol::resource::TextureFile>(object2);
if (object == nullptr) { if (object == nullptr) {
EWOL_CRITICAL("Request resource file : '" << tmpFilename << "' With the wrong type (dynamic cast error)"); EWOL_CRITICAL("Request resource file : '" << tmpFilename << "' With the wrong type (dynamic cast error)");
return nullptr; return nullptr;
@ -122,7 +122,7 @@ std::shared_ptr<ewol::resource::TextureFile> ewol::resource::TextureFile::create
} }
EWOL_INFO("CREATE: TextureFile: '" << tmpFilename << "' size=" << _size); EWOL_INFO("CREATE: TextureFile: '" << tmpFilename << "' size=" << _size);
// need to crate a new one ... // need to crate a new one ...
object = std::shared_ptr<ewol::resource::TextureFile>(new ewol::resource::TextureFile()); object = ememory::SharedPtr<ewol::resource::TextureFile>(new ewol::resource::TextureFile());
if (object == nullptr) { if (object == nullptr) {
EWOL_ERROR("allocation error of a resource : " << _filename); EWOL_ERROR("allocation error of a resource : " << _filename);
return nullptr; return nullptr;

2
ewol/resource/Image.h
View File

@ -40,7 +40,7 @@ namespace ewol {
* @param[in] _sizeRegister size register in named (When you preaload the images the size write here will be ) * @param[in] _sizeRegister size register in named (When you preaload the images the size write here will be )
* @return pointer on the resource or nullptr if an error occured. * @return pointer on the resource or nullptr if an error occured.
*/ */
static std::shared_ptr<ewol::resource::TextureFile> create(const std::string& _filename, static ememory::SharedPtr<ewol::resource::TextureFile> create(const std::string& _filename,
ivec2 _size=ewol::resource::TextureFile::sizeAuto, ivec2 _size=ewol::resource::TextureFile::sizeAuto,
ivec2 _sizeRegister=ewol::resource::TextureFile::sizeAuto); ivec2 _sizeRegister=ewol::resource::TextureFile::sizeAuto);
}; };

12
ewol/resource/ImageDF.cpp
View File

@ -150,10 +150,10 @@ static int32_t nextP2(int32_t _value) {
std::shared_ptr<ewol::resource::ImageDF> ewol::resource::ImageDF::create(const std::string& _filename, ivec2 _size) { ememory::SharedPtr<ewol::resource::ImageDF> ewol::resource::ImageDF::create(const std::string& _filename, ivec2 _size) {
EWOL_VERBOSE("KEEP: TextureFile: '" << _filename << "' size=" << _size); EWOL_VERBOSE("KEEP: TextureFile: '" << _filename << "' size=" << _size);
if (_filename == "") { if (_filename == "") {
std::shared_ptr<ewol::resource::ImageDF> object(new ewol::resource::ImageDF()); ememory::SharedPtr<ewol::resource::ImageDF> object(new ewol::resource::ImageDF());
if (nullptr == object) { if (nullptr == object) {
EWOL_ERROR("allocation error of a resource : ??TEX??"); EWOL_ERROR("allocation error of a resource : ??TEX??");
return nullptr; return nullptr;
@ -190,10 +190,10 @@ std::shared_ptr<ewol::resource::ImageDF> ewol::resource::ImageDF::create(const s
} }
EWOL_VERBOSE("KEEP: TextureFile: '" << TmpFilename << "' new size=" << _size); EWOL_VERBOSE("KEEP: TextureFile: '" << TmpFilename << "' new size=" << _size);
std::shared_ptr<ewol::resource::ImageDF> object = nullptr; ememory::SharedPtr<ewol::resource::ImageDF> object = nullptr;
std::shared_ptr<gale::Resource> object2 = getManager().localKeep("DF__" + TmpFilename); ememory::SharedPtr<gale::Resource> object2 = getManager().localKeep("DF__" + TmpFilename);
if (nullptr != object2) { if (nullptr != object2) {
object = std::dynamic_pointer_cast<ewol::resource::ImageDF>(object2); object = ememory::dynamicPointerCast<ewol::resource::ImageDF>(object2);
if (nullptr == object) { if (nullptr == object) {
EWOL_CRITICAL("Request resource file : '" << TmpFilename << "' With the wrong type (dynamic cast error)"); EWOL_CRITICAL("Request resource file : '" << TmpFilename << "' With the wrong type (dynamic cast error)");
return nullptr; return nullptr;
@ -204,7 +204,7 @@ std::shared_ptr<ewol::resource::ImageDF> ewol::resource::ImageDF::create(const s
} }
EWOL_INFO("CREATE: ImageDF: '" << TmpFilename << "' size=" << _size); EWOL_INFO("CREATE: ImageDF: '" << TmpFilename << "' size=" << _size);
// need to crate a new one ... // need to crate a new one ...
object = std::shared_ptr<ewol::resource::ImageDF>(new ewol::resource::ImageDF()); object = ememory::SharedPtr<ewol::resource::ImageDF>(new ewol::resource::ImageDF());
if (nullptr == object) { if (nullptr == object) {
EWOL_ERROR("allocation error of a resource : " << _filename); EWOL_ERROR("allocation error of a resource : " << _filename);
return nullptr; return nullptr;

2
ewol/resource/ImageDF.h
View File

@ -41,7 +41,7 @@ namespace ewol {
* @param[in] _requested size of the image (usefull when loading .svg to automatic rescale) * @param[in] _requested size of the image (usefull when loading .svg to automatic rescale)
* @return pointer on the resource or nullptr if an error occured. * @return pointer on the resource or nullptr if an error occured.
*/ */
static std::shared_ptr<ewol::resource::ImageDF> create(const std::string& _filename, ivec2 _size=ivec2(-1,-1)); static ememory::SharedPtr<ewol::resource::ImageDF> create(const std::string& _filename, ivec2 _size=ivec2(-1,-1));
}; };
}; };
}; };

2
ewol/resource/Texture.cpp
View File

@ -135,7 +135,7 @@ void ewol::resource::Texture::flush() {
std::unique_lock<std::recursive_mutex> lock(m_mutex); std::unique_lock<std::recursive_mutex> lock(m_mutex);
// request to the manager to be call at the next update ... // request to the manager to be call at the next update ...
EWOL_INFO("Request UPDATE of Element"); EWOL_INFO("Request UPDATE of Element");
getManager().update(std::dynamic_pointer_cast<gale::Resource>(shared_from_this())); getManager().update(ememory::dynamicPointerCast<gale::Resource>(sharedFromThis()));
} }
void ewol::resource::Texture::setImageSize(ivec2 _newSize) { void ewol::resource::Texture::setImageSize(ivec2 _newSize) {

2
ewol/resource/TexturedFont.h
View File

@ -31,7 +31,7 @@ namespace ewol {
// specific element to have the the know if the specify element is known... // specific element to have the the know if the specify element is known...
// == > otherwise I can just generate italic ... // == > otherwise I can just generate italic ...
// == > Bold is a little more complicated (maybe with the bordersize) // == > Bold is a little more complicated (maybe with the bordersize)
std::shared_ptr<ewol::resource::FontBase> m_font[4]; ememory::SharedPtr<ewol::resource::FontBase> m_font[4];
enum ewol::font::mode m_modeWraping[4]; //!< This is a wrapping mode to prevent the fact that no font is define for a specific mode enum ewol::font::mode m_modeWraping[4]; //!< This is a wrapping mode to prevent the fact that no font is define for a specific mode
public: public:
std::vector<GlyphProperty> m_listElement[4]; std::vector<GlyphProperty> m_listElement[4];

2
ewol/widget/ButtonColor.cpp
View File

@ -169,7 +169,7 @@ bool ewol::widget::ButtonColor::onEventInput(const ewol::event::Input& _event) {
myColorChooser->propertyValue.set(propertyValue.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.connect(shared_from_this(), &ewol::widget::ButtonColor::onCallbackColorChange); myColorChooser->signalChange.connect(sharedFromThis(), &ewol::widget::ButtonColor::onCallbackColorChange);
ewol::widget::WindowsShared currentWindows = getWindows(); ewol::widget::WindowsShared currentWindows = getWindows();
if (currentWindows == nullptr) { if (currentWindows == nullptr) {
EWOL_ERROR("Can not get the curent Windows..."); EWOL_ERROR("Can not get the curent Windows...");

4
ewol/widget/Container.cpp
View File

@ -29,7 +29,7 @@ void ewol::widget::Container::setSubWidget(ewol::WidgetShared _newWidget) {
subWidgetRemove(); subWidgetRemove();
m_subWidget = _newWidget; m_subWidget = _newWidget;
if (m_subWidget != nullptr) { if (m_subWidget != nullptr) {
m_subWidget->setParent(shared_from_this()); m_subWidget->setParent(sharedFromThis());
} }
markToRedraw(); markToRedraw();
requestUpdateSize(); requestUpdateSize();
@ -45,7 +45,7 @@ void ewol::widget::Container::subWidgetReplace(const ewol::WidgetShared& _oldWid
m_subWidget.reset(); m_subWidget.reset();
m_subWidget = _newWidget; m_subWidget = _newWidget;
if (m_subWidget != nullptr) { if (m_subWidget != nullptr) {
m_subWidget->setParent(shared_from_this()); m_subWidget->setParent(sharedFromThis());
} }
markToRedraw(); markToRedraw();
requestUpdateSize(); requestUpdateSize();

4
ewol/widget/Container2.cpp
View File

@ -24,7 +24,7 @@ void ewol::widget::Container2::setSubWidget(ewol::WidgetShared _newWidget, int32
m_subWidget[_idWidget] = _newWidget; m_subWidget[_idWidget] = _newWidget;
if (m_subWidget[_idWidget] != nullptr) { if (m_subWidget[_idWidget] != nullptr) {
EWOL_VERBOSE("Add widget : " << _idWidget); EWOL_VERBOSE("Add widget : " << _idWidget);
m_subWidget[_idWidget]->setParent(shared_from_this()); m_subWidget[_idWidget]->setParent(sharedFromThis());
} }
markToRedraw(); markToRedraw();
requestUpdateSize(); requestUpdateSize();
@ -41,7 +41,7 @@ void ewol::widget::Container2::subWidgetReplace(const ewol::WidgetShared& _oldWi
m_subWidget[iii].reset(); m_subWidget[iii].reset();
m_subWidget[iii] = _newWidget; m_subWidget[iii] = _newWidget;
if (m_subWidget[iii] != nullptr) { if (m_subWidget[iii] != nullptr) {
m_subWidget[iii]->setParent(shared_from_this()); m_subWidget[iii]->setParent(sharedFromThis());
} }
haveChange = true; haveChange = true;
} }

6
ewol/widget/ContainerN.cpp
View File

@ -55,7 +55,7 @@ void ewol::widget::ContainerN::subWidgetReplace(const ewol::WidgetShared& _oldWi
it->removeParent(); it->removeParent();
it.reset(); it.reset();
if (_newWidget != nullptr) { if (_newWidget != nullptr) {
_newWidget->setParent(shared_from_this()); _newWidget->setParent(sharedFromThis());
} }
it = _newWidget; it = _newWidget;
haveChange = true; haveChange = true;
@ -73,7 +73,7 @@ int32_t ewol::widget::ContainerN::subWidgetAdd(ewol::WidgetShared _newWidget) {
EWOL_ERROR("[" << getId() << "] {" << getObjectType() << "} Try to add An empty Widget ... "); EWOL_ERROR("[" << getId() << "] {" << getObjectType() << "} Try to add An empty Widget ... ");
return -1; return -1;
} }
_newWidget->setParent(shared_from_this()); _newWidget->setParent(sharedFromThis());
m_subWidget.push_back(_newWidget); m_subWidget.push_back(_newWidget);
markToRedraw(); markToRedraw();
requestUpdateSize(); requestUpdateSize();
@ -87,7 +87,7 @@ int32_t ewol::widget::ContainerN::subWidgetAddStart(ewol::WidgetShared _newWidge
return -1; return -1;
} }
if (_newWidget != nullptr) { if (_newWidget != nullptr) {
_newWidget->setParent(shared_from_this()); _newWidget->setParent(sharedFromThis());
} }
m_subWidget.insert(m_subWidget.begin(), _newWidget); m_subWidget.insert(m_subWidget.begin(), _newWidget);
markToRedraw(); markToRedraw();

2
ewol/widget/ContextMenu.cpp
View File

@ -225,7 +225,7 @@ ewol::WidgetShared ewol::widget::ContextMenu::getWidgetAtPos(const vec2& _pos) {
if (val != nullptr) { if (val != nullptr) {
return val; return val;
} }
return std::dynamic_pointer_cast<ewol::Widget>(shared_from_this()); return ememory::dynamicPointerCast<ewol::Widget>(sharedFromThis());
} }
void ewol::widget::ContextMenu::onChangePropertyArrowPos() { void ewol::widget::ContextMenu::onChangePropertyArrowPos() {

2
ewol/widget/Entry.cpp
View File

@ -66,7 +66,7 @@ void ewol::widget::Entry::init() {
shortCutAdd("ctrl+v", "paste"); shortCutAdd("ctrl+v", "paste");
shortCutAdd("ctrl+a", "select:all"); shortCutAdd("ctrl+a", "select:all");
shortCutAdd("ctrl+shift+a", "select:none"); shortCutAdd("ctrl+shift+a", "select:none");
signalShortcut.connect(shared_from_this(), &ewol::widget::Entry::onCallbackShortCut); signalShortcut.connect(sharedFromThis(), &ewol::widget::Entry::onCallbackShortCut);
} }

2
ewol/widget/Image.h
View File

@ -36,7 +36,7 @@ namespace ewol {
eproperty::Value<bool> propertyUseThemeColor; //!< Use the themo color management ("{ewol}THEME:COLOR:Image.json") default false eproperty::Value<bool> propertyUseThemeColor; //!< Use the themo color management ("{ewol}THEME:COLOR:Image.json") default 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 ememory::SharedPtr<ewol::resource::ColorFile> m_colorProperty; //!< theme color property
int32_t m_colorId; //!< Color of the image. int32_t m_colorId; //!< Color of the image.
public: public:
/** /**

2
ewol/widget/Label.h
View File

@ -30,7 +30,7 @@ namespace ewol {
private: private:
ewol::compositing::Text m_text; //!< Compositing text element. ewol::compositing::Text m_text; //!< Compositing text element.
std::u32string m_value; std::u32string m_value;
std::shared_ptr<ewol::resource::ColorFile> m_colorProperty; //!< theme color property ememory::SharedPtr<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
protected: protected:

2
ewol/widget/ListFileSystem.h
View File

@ -37,7 +37,7 @@ namespace ewol {
DECLARE_WIDGET_FACTORY(ListFileSystem, "ListFileSystem"); DECLARE_WIDGET_FACTORY(ListFileSystem, "ListFileSystem");
virtual ~ListFileSystem(); virtual ~ListFileSystem();
protected: protected:
std::shared_ptr<ewol::resource::ColorFile> m_colorProperty; //!< theme color property. ememory::SharedPtr<ewol::resource::ColorFile> m_colorProperty; //!< theme color property.
int32_t m_colorIdText; //!< Color of the text. int32_t m_colorIdText; //!< Color of the text.
int32_t m_colorIdBackground1; //!< Color of the Background. int32_t m_colorIdBackground1; //!< Color of the Background.
int32_t m_colorIdBackground2; //!< Color of the Background 2. int32_t m_colorIdBackground2; //!< Color of the Background 2.

6
ewol/widget/Menu.cpp
View File

@ -101,7 +101,7 @@ int32_t ewol::widget::Menu::add(int32_t _parent,
// add it in the widget list // add it in the widget list
ewol::widget::Sizer::subWidgetAdd(myButton); ewol::widget::Sizer::subWidgetAdd(myButton);
// keep the specific event ... // keep the specific event ...
myButton->signalPressed.connect(shared_from_this(), &ewol::widget::Menu::onButtonPressed, ewol::widget::ButtonWeak(myButton)); myButton->signalPressed.connect(sharedFromThis(), &ewol::widget::Menu::onButtonPressed, ewol::widget::ButtonWeak(myButton));
tmpObject.m_widgetPointer = myButton; tmpObject.m_widgetPointer = myButton;
} }
m_listElement.push_back(tmpObject); m_listElement.push_back(tmpObject);
@ -160,7 +160,7 @@ void ewol::widget::Menu::onButtonPressed(ewol::widget::ButtonWeak _button) {
} }
// get the button widget: // get the button widget:
vec2 newPosition; vec2 newPosition;
ewol::WidgetShared eventFromWidget = std::dynamic_pointer_cast<ewol::Widget>(caller); ewol::WidgetShared eventFromWidget = ememory::dynamicPointerCast<ewol::Widget>(caller);
if (eventFromWidget != nullptr) { if (eventFromWidget != nullptr) {
vec2 tmpOri = eventFromWidget->getOrigin(); vec2 tmpOri = eventFromWidget->getOrigin();
vec2 tmpSize = eventFromWidget->getSize(); vec2 tmpSize = eventFromWidget->getSize();
@ -200,7 +200,7 @@ void ewol::widget::Menu::onButtonPressed(ewol::widget::ButtonWeak _button) {
myButton->propertyExpand.set(bvec2(true,true)); myButton->propertyExpand.set(bvec2(true,true));
myButton->propertyFill.set(bvec2(true,true)); myButton->propertyFill.set(bvec2(true,true));
// set callback // set callback
myButton->signalPressed.connect(shared_from_this(), &ewol::widget::Menu::onButtonPressed, ewol::widget::ButtonWeak(myButton)); myButton->signalPressed.connect(sharedFromThis(), &ewol::widget::Menu::onButtonPressed, ewol::widget::ButtonWeak(myButton));
// add it in the widget list // add it in the widget list
mySizer->subWidgetAdd(myButton); mySizer->subWidgetAdd(myButton);
if (it2->m_image.size() != 0) { if (it2->m_image.size() != 0) {

2
ewol/widget/PopUp.cpp
View File

@ -130,7 +130,7 @@ ewol::WidgetShared ewol::widget::PopUp::getWidgetAtPos(const vec2& _pos) {
if (val != nullptr) { if (val != nullptr) {
return val; return val;
} }
return std::dynamic_pointer_cast<ewol::Widget>(shared_from_this()); return ememory::dynamicPointerCast<ewol::Widget>(sharedFromThis());
} }
void ewol::widget::PopUp::onChangePropertyShape() { void ewol::widget::PopUp::onChangePropertyShape() {

2
ewol/widget/Scroll.cpp
View File

@ -423,7 +423,7 @@ ewol::WidgetShared ewol::widget::Scroll::getWidgetAtPos(const vec2& _pos) {
if (tmpWidget != nullptr) { if (tmpWidget != nullptr) {
return tmpWidget; return tmpWidget;
} }
return std::dynamic_pointer_cast<ewol::Widget>(shared_from_this());; return ememory::dynamicPointerCast<ewol::Widget>(sharedFromThis());;
} }
void ewol::widget::Scroll::onChangePropertyLimit() { void ewol::widget::Scroll::onChangePropertyLimit() {

2
ewol/widget/Select.cpp
View File

@ -187,7 +187,7 @@ void ewol::widget::Select::onCallbackOpenMenu() {
myLabel->propertyExpand.set(bvec2(true,true)); myLabel->propertyExpand.set(bvec2(true,true));
myLabel->propertyFill.set(bvec2(true,true)); myLabel->propertyFill.set(bvec2(true,true));
// set callback // set callback
myLabel->signalPressed.connect(shared_from_this(), &ewol::widget::Select::onCallbackLabelPressed, it.m_value); myLabel->signalPressed.connect(sharedFromThis(), &ewol::widget::Select::onCallbackLabelPressed, it.m_value);
myLabel->signalPressed.connect(tmpContext, &ewol::widget::ContextMenu::destroy); myLabel->signalPressed.connect(tmpContext, &ewol::widget::ContextMenu::destroy);
// add it in the widget list // add it in the widget list
mySizer->subWidgetAddStart(myLabel); mySizer->subWidgetAddStart(myLabel);

8
ewol/widget/Widget.cpp
View File

@ -116,7 +116,7 @@ bool ewol::Widget::rmFocus() {
} }
void ewol::Widget::keepFocus() { void ewol::Widget::keepFocus() {
getWidgetManager().focusKeep(std::dynamic_pointer_cast<ewol::Widget>(shared_from_this())); getWidgetManager().focusKeep(ememory::dynamicPointerCast<ewol::Widget>(sharedFromThis()));
} }
void ewol::Widget::setOffset(const vec2& _newVal) { void ewol::Widget::setOffset(const vec2& _newVal) {
@ -513,7 +513,7 @@ bool ewol::Widget::onEventShortCut(const gale::key::Special& _special,
void ewol::Widget::grabCursor() { void ewol::Widget::grabCursor() {
if (m_grabCursor == false) { if (m_grabCursor == false) {
getContext().inputEventGrabPointer(std::dynamic_pointer_cast<ewol::Widget>(shared_from_this())); getContext().inputEventGrabPointer(ememory::dynamicPointerCast<ewol::Widget>(sharedFromThis()));
m_grabCursor = true; m_grabCursor = true;
} }
} }
@ -546,7 +546,7 @@ bool ewol::Widget::loadXML(const exml::Element& _node) {
} }
bool ewol::Widget::systemEventEntry(ewol::event::EntrySystem& _event) { bool ewol::Widget::systemEventEntry(ewol::event::EntrySystem& _event) {
ewol::WidgetShared up = std::dynamic_pointer_cast<ewol::Widget>(m_parent.lock()); ewol::WidgetShared up = ememory::dynamicPointerCast<ewol::Widget>(m_parent.lock());
if (up != nullptr) { if (up != nullptr) {
if (up->systemEventEntry(_event) == true) { if (up->systemEventEntry(_event) == true) {
return true; return true;
@ -556,7 +556,7 @@ bool ewol::Widget::systemEventEntry(ewol::event::EntrySystem& _event) {
} }
bool ewol::Widget::systemEventInput(ewol::event::InputSystem& _event) { bool ewol::Widget::systemEventInput(ewol::event::InputSystem& _event) {
ewol::WidgetShared up = std::dynamic_pointer_cast<ewol::Widget>(m_parent.lock()); ewol::WidgetShared up = ememory::dynamicPointerCast<ewol::Widget>(m_parent.lock());
if (up != nullptr) { if (up != nullptr) {
if (up->systemEventInput(_event) == true) { if (up->systemEventInput(_event) == true) {
return true; return true;

2
ewol/widget/Widget.h
View File

@ -350,7 +350,7 @@ namespace ewol {
*/ */
virtual ewol::WidgetShared getWidgetAtPos(const vec2& _pos) { virtual ewol::WidgetShared getWidgetAtPos(const vec2& _pos) {
if (propertyHide.get() == false) { if (propertyHide.get() == false) {
return std::dynamic_pointer_cast<ewol::Widget>(shared_from_this()); return ememory::dynamicPointerCast<ewol::Widget>(sharedFromThis());
} }
return nullptr; return nullptr;
}; };

8
ewol/widget/Windows.cpp
View File

@ -67,7 +67,7 @@ ewol::WidgetShared ewol::widget::Windows::getWidgetAtPos(const vec2& _pos) {
return m_subWidget->getWidgetAtPos(_pos); return m_subWidget->getWidgetAtPos(_pos);
} }
// otherwise the event go to this widget ... // otherwise the event go to this widget ...
return std::dynamic_pointer_cast<ewol::Widget>(shared_from_this()); return ememory::dynamicPointerCast<ewol::Widget>(sharedFromThis());
} }
void ewol::widget::Windows::sysDraw() { void ewol::widget::Windows::sysDraw() {
@ -164,7 +164,7 @@ void ewol::widget::Windows::setSubWidget(ewol::WidgetShared _widget) {
} }
if (_widget != nullptr) { if (_widget != nullptr) {
m_subWidget = _widget; m_subWidget = _widget;
m_subWidget->setParent(shared_from_this()); m_subWidget->setParent(sharedFromThis());
} }
// Regenerate the size calculation : // Regenerate the size calculation :
@ -178,7 +178,7 @@ void ewol::widget::Windows::popUpWidgetPush(ewol::WidgetShared _widget) {
return; return;
} }
m_popUpWidgetList.push_back(_widget); m_popUpWidgetList.push_back(_widget);
_widget->setParent(shared_from_this()); _widget->setParent(sharedFromThis());
// force the focus on the basic widget ==> this remove many time the virual keyboard area // force the focus on the basic widget ==> this remove many time the virual keyboard area
_widget->keepFocus(); _widget->keepFocus();
// Regenerate the size calculation : // Regenerate the size calculation :
@ -203,7 +203,7 @@ void ewol::widget::Windows::onChangePropertyColor() {
void ewol::widget::Windows::onChangePropertyTitle() { void ewol::widget::Windows::onChangePropertyTitle() {
ewol::Context& context = getContext(); ewol::Context& context = getContext();
if (context.getWindows() == shared_from_this()) { if (context.getWindows() == sharedFromThis()) {
context.setTitle(*propertyTitle); context.setTitle(*propertyTitle);
} else { } else {
EWOL_INFO("Set title is delayed ..."); EWOL_INFO("Set title is delayed ...");

2
ewol/widget/Windows.h
View File

@ -25,7 +25,7 @@ namespace ewol {
eproperty::Value<std::string> propertyColorConfiguration; //!< Configuration file of the windows theme eproperty::Value<std::string> propertyColorConfiguration; //!< Configuration file of the windows theme
eproperty::Value<std::string> propertyTitle; //!< Current title of the windows eproperty::Value<std::string> propertyTitle; //!< Current title of the windows
protected: protected:
std::shared_ptr<ewol::resource::ColorFile> m_resourceColor; //!< theme color property (name of file in @ref propertyColorConfiguration) ememory::SharedPtr<ewol::resource::ColorFile> m_resourceColor; //!< theme color property (name of file in @ref propertyColorConfiguration)
int32_t m_colorBg; //!< Default background color of the windows int32_t m_colorBg; //!< Default background color of the windows
protected: protected:
Windows(); Windows();

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

@ -31,7 +31,7 @@ void ewol::widget::ColorChooser::init() {
propertyMode.set(ewol::widget::Sizer::modeVert); propertyMode.set(ewol::widget::Sizer::modeVert);
propertyLockExpand.set(bvec2(true,true)); propertyLockExpand.set(bvec2(true,true));
m_widgetColorBar = ewol::widget::ColorBar::create(); m_widgetColorBar = ewol::widget::ColorBar::create();
m_widgetColorBar->signalChange.connect(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChange); m_widgetColorBar->signalChange.connect(sharedFromThis(), &ewol::widget::ColorChooser::onCallbackColorChange);
m_widgetColorBar->propertyFill.set(bvec2(true,true)); m_widgetColorBar->propertyFill.set(bvec2(true,true));
subWidgetAdd(m_widgetColorBar); subWidgetAdd(m_widgetColorBar);
@ -39,7 +39,7 @@ void ewol::widget::ColorChooser::init() {
sliderColor = etk::color::black; sliderColor = etk::color::black;
m_widgetRed = ewol::widget::Slider::create(); m_widgetRed = ewol::widget::Slider::create();
m_widgetRed->signalChange.connect(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChangeRed); m_widgetRed->signalChange.connect(sharedFromThis(), &ewol::widget::ColorChooser::onCallbackColorChangeRed);
m_widgetRed->propertyExpand.set(bvec2(true,false)); m_widgetRed->propertyExpand.set(bvec2(true,false));
m_widgetRed->propertyFill.set(bvec2(true,false)); m_widgetRed->propertyFill.set(bvec2(true,false));
m_widgetRed->propertyMinimum.set(0); m_widgetRed->propertyMinimum.set(0);
@ -48,7 +48,7 @@ void ewol::widget::ColorChooser::init() {
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.connect(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChangeGreen); m_widgetGreen->signalChange.connect(sharedFromThis(), &ewol::widget::ColorChooser::onCallbackColorChangeGreen);
m_widgetGreen->propertyExpand.set(bvec2(true,false)); m_widgetGreen->propertyExpand.set(bvec2(true,false));
m_widgetGreen->propertyFill.set(bvec2(true,false)); m_widgetGreen->propertyFill.set(bvec2(true,false));
m_widgetGreen->propertyMinimum.set(0); m_widgetGreen->propertyMinimum.set(0);
@ -57,7 +57,7 @@ void ewol::widget::ColorChooser::init() {
m_widgetGreen->setColor(sliderColor); m_widgetGreen->setColor(sliderColor);
subWidgetAdd(m_widgetGreen); subWidgetAdd(m_widgetGreen);
m_widgetBlue = ewol::widget::Slider::create(); m_widgetBlue = ewol::widget::Slider::create();
m_widgetBlue->signalChange.connect(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChangeBlue); m_widgetBlue->signalChange.connect(sharedFromThis(), &ewol::widget::ColorChooser::onCallbackColorChangeBlue);
m_widgetBlue->propertyExpand.set(bvec2(true,false)); m_widgetBlue->propertyExpand.set(bvec2(true,false));
m_widgetBlue->propertyFill.set(bvec2(true,false)); m_widgetBlue->propertyFill.set(bvec2(true,false));
m_widgetBlue->propertyMinimum.set(0); m_widgetBlue->propertyMinimum.set(0);
@ -66,7 +66,7 @@ void ewol::widget::ColorChooser::init() {
m_widgetBlue->setColor(sliderColor); m_widgetBlue->setColor(sliderColor);
subWidgetAdd(m_widgetBlue); subWidgetAdd(m_widgetBlue);
m_widgetAlpha = ewol::widget::Slider::create(); m_widgetAlpha = ewol::widget::Slider::create();
m_widgetAlpha->signalChange.connect(shared_from_this(), &ewol::widget::ColorChooser::onCallbackColorChangeAlpha); m_widgetAlpha->signalChange.connect(sharedFromThis(), &ewol::widget::ColorChooser::onCallbackColorChangeAlpha);
m_widgetAlpha->propertyExpand.set(bvec2(true,false)); m_widgetAlpha->propertyExpand.set(bvec2(true,false));
m_widgetAlpha->propertyFill.set(bvec2(true,false)); m_widgetAlpha->propertyFill.set(bvec2(true,false));
m_widgetAlpha->propertyMinimum.set(0); m_widgetAlpha->propertyMinimum.set(0);

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

@ -108,17 +108,17 @@ void ewol::widget::FileChooser::init() {
+ " </sizer>\n" + " </sizer>\n"
+ "</popup>"; + "</popup>";
loadFromString(myDescription); loadFromString(myDescription);
subBind(ewol::widget::CheckBox, "[" + etk::to_string(getId()) + "]file-shooser:show-hiden-file", signalValue, shared_from_this(), &ewol::widget::FileChooser::onCallbackHidenFileChangeChangeValue); subBind(ewol::widget::CheckBox, "[" + etk::to_string(getId()) + "]file-shooser:show-hiden-file", signalValue, sharedFromThis(), &ewol::widget::FileChooser::onCallbackHidenFileChangeChangeValue);
subBind(ewol::widget::Button, "[" + etk::to_string(getId()) + "]file-shooser:button-validate", signalPressed, shared_from_this(), &ewol::widget::FileChooser::onCallbackListValidate); subBind(ewol::widget::Button, "[" + etk::to_string(getId()) + "]file-shooser:button-validate", signalPressed, sharedFromThis(), &ewol::widget::FileChooser::onCallbackListValidate);
subBind(ewol::widget::Button, "[" + etk::to_string(getId()) + "]file-shooser:button-cancel", signalPressed, shared_from_this(), &ewol::widget::FileChooser::onCallbackButtonCancelPressed); subBind(ewol::widget::Button, "[" + etk::to_string(getId()) + "]file-shooser:button-cancel", signalPressed, sharedFromThis(), &ewol::widget::FileChooser::onCallbackButtonCancelPressed);
subBind(ewol::widget::ListFileSystem, "[" + etk::to_string(getId()) + "]file-shooser:list-folder", signalFolderValidate, shared_from_this(), &ewol::widget::FileChooser::onCallbackListFolderSelectChange); subBind(ewol::widget::ListFileSystem, "[" + etk::to_string(getId()) + "]file-shooser:list-folder", signalFolderValidate, sharedFromThis(), &ewol::widget::FileChooser::onCallbackListFolderSelectChange);
subBind(ewol::widget::ListFileSystem, "[" + etk::to_string(getId()) + "]file-shooser:list-files", signalFileSelect, shared_from_this(), &ewol::widget::FileChooser::onCallbackListFileSelectChange); subBind(ewol::widget::ListFileSystem, "[" + etk::to_string(getId()) + "]file-shooser:list-files", signalFileSelect, sharedFromThis(), &ewol::widget::FileChooser::onCallbackListFileSelectChange);
subBind(ewol::widget::ListFileSystem, "[" + etk::to_string(getId()) + "]file-shooser:list-files", signalFileValidate, shared_from_this(), &ewol::widget::FileChooser::onCallbackListFileValidate); subBind(ewol::widget::ListFileSystem, "[" + etk::to_string(getId()) + "]file-shooser:list-files", signalFileValidate, sharedFromThis(), &ewol::widget::FileChooser::onCallbackListFileValidate);
subBind(ewol::widget::Entry, "[" + etk::to_string(getId()) + "]file-shooser:entry-file", signalModify, shared_from_this(), &ewol::widget::FileChooser::onCallbackEntryFileChangeValue); subBind(ewol::widget::Entry, "[" + etk::to_string(getId()) + "]file-shooser:entry-file", signalModify, sharedFromThis(), &ewol::widget::FileChooser::onCallbackEntryFileChangeValue);
subBind(ewol::widget::Entry, "[" + etk::to_string(getId()) + "]file-shooser:entry-file", signalEnter, shared_from_this(), &ewol::widget::FileChooser::onCallbackListFileValidate); subBind(ewol::widget::Entry, "[" + etk::to_string(getId()) + "]file-shooser:entry-file", signalEnter, sharedFromThis(), &ewol::widget::FileChooser::onCallbackListFileValidate);
subBind(ewol::widget::Entry, "[" + etk::to_string(getId()) + "]file-shooser:entry-folder", signalModify, shared_from_this(), &ewol::widget::FileChooser::onCallbackEntryFolderChangeValue); subBind(ewol::widget::Entry, "[" + etk::to_string(getId()) + "]file-shooser:entry-folder", signalModify, sharedFromThis(), &ewol::widget::FileChooser::onCallbackEntryFolderChangeValue);
//composerBind(ewol::widget::CheckBox, "[" + etk::to_string(getId()) + "]file-shooser:entry-folder", signalEnter, shared_from_this(), &ewol::widget::FileChooser::); //composerBind(ewol::widget::CheckBox, "[" + etk::to_string(getId()) + "]file-shooser:entry-folder", signalEnter, sharedFromThis(), &ewol::widget::FileChooser::);
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, sharedFromThis(), &ewol::widget::FileChooser::onCallbackHomePressed);
// set the default Folder properties: // set the default Folder properties:
updateCurrentFolder(); updateCurrentFolder();
propertyCanFocus.set(true); propertyCanFocus.set(true);

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

@ -33,9 +33,9 @@ namespace ewol {
* return -1; * return -1;
* } * }
* // register on the Validate event: * // register on the Validate event:
* tmpWidget->signalValidate.connect(shared_from_this(), &****::onCallbackOpenFile); * tmpWidget->signalValidate.connect(sharedFromThis(), &****::onCallbackOpenFile);
* // no need of this event watching ... * // no need of this event watching ...
* tmpWidget->signalCancel.connect(shared_from_this(), &****::onCallbackClosePopUp); * tmpWidget->signalCancel.connect(sharedFromThis(), &****::onCallbackClosePopUp);
* // set the title: * // set the title:
* tmpWidget->propertyLabelTitle.set("Open files ..."); * tmpWidget->propertyLabelTitle.set("Open files ...");
* // Set the validate Label: * // Set the validate Label:

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

@ -74,7 +74,7 @@ void ewol::widget::Parameter::init() {
" <image src='{ewol}THEME:GUI:Save.svg' expand='true' size='8,8mm'/>\n" " <image src='{ewol}THEME:GUI:Save.svg' expand='true' size='8,8mm'/>\n"
" <label>_T{Save}</label>\n" " <label>_T{Save}</label>\n"
"</sizer>\n")); "</sizer>\n"));
tmpButton->signalPressed.connect(shared_from_this(), &ewol::widget::Parameter::onCallbackParameterSave); tmpButton->signalPressed.connect(sharedFromThis(), &ewol::widget::Parameter::onCallbackParameterSave);
mySizerHori->subWidgetAdd(tmpButton); mySizerHori->subWidgetAdd(tmpButton);
} }
@ -96,7 +96,7 @@ void ewol::widget::Parameter::init() {
" <image src='{ewol}THEME:GUI:Remove.svg' expand='true' size='8,8mm'/>\n" " <image src='{ewol}THEME:GUI:Remove.svg' expand='true' size='8,8mm'/>\n"
" <label>_T{Close}</label>\n" " <label>_T{Close}</label>\n"
"</sizer>\n")); "</sizer>\n"));
tmpButton->signalPressed.connect(shared_from_this(), &ewol::widget::Parameter::onCallbackMenuclosed); tmpButton->signalPressed.connect(sharedFromThis(), &ewol::widget::Parameter::onCallbackMenuclosed);
mySizerHori->subWidgetAdd(tmpButton); mySizerHori->subWidgetAdd(tmpButton);
} }
} }
@ -113,7 +113,7 @@ void ewol::widget::Parameter::init() {
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.connect(shared_from_this(), &ewol::widget::Parameter::onCallbackMenuSelected); m_paramList->signalSelect.connect(sharedFromThis(), &ewol::widget::Parameter::onCallbackMenuSelected);
m_paramList->propertyFill.set(bvec2(false,true)); m_paramList->propertyFill.set(bvec2(false,true));
m_paramList->propertyExpand.set(bvec2(false,true)); m_paramList->propertyExpand.set(bvec2(false,true));
mySizerHori->subWidgetAdd(m_paramList); mySizerHori->subWidgetAdd(m_paramList);

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

@ -68,7 +68,7 @@ namespace ewol {
public: public:
UN_DECLARE_FACTORY(SpinBase); UN_DECLARE_FACTORY(SpinBase);
protected: protected:
std::shared_ptr<ewol::resource::ConfigFile> m_config; ememory::SharedPtr<ewol::resource::ConfigFile> m_config;
int32_t m_confIdEntryShaper; int32_t m_confIdEntryShaper;
int32_t m_confIdUpShaper; int32_t m_confIdUpShaper;
int32_t m_confIdDownShaper; int32_t m_confIdDownShaper;

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

@ -117,7 +117,7 @@ ewol::widget::ButtonShared ewol::widget::StdPopUp::addButton(const std::string&
myLabel->propertyValue.set(_text); myLabel->propertyValue.set(_text);
myButton->setSubWidget(myLabel); myButton->setSubWidget(myLabel);
if(_autoExit == true) { if(_autoExit == true) {
myButton->signalPressed.connect(shared_from_this(), &ewol::widget::StdPopUp::onCallBackButtonExit); myButton->signalPressed.connect(sharedFromThis(), &ewol::widget::StdPopUp::onCallBackButtonExit);
} }
m_subBar->subWidgetAdd(myButton); m_subBar->subWidgetAdd(myButton);
markToRedraw(); markToRedraw();

8
sample/CustomWidgets/appl/Windows.cpp
View File

@ -44,8 +44,8 @@ void appl::Windows::init() {
} }
m_composer->loadFromString(composition); m_composer->loadFromString(composition);
setSubWidget(m_composer); setSubWidget(m_composer);
subBind(ewol::widget::Button, "bt-change", signalPressed, shared_from_this(), &appl::Windows::onCallbackChangeValues); subBind(ewol::widget::Button, "bt-change", signalPressed, sharedFromThis(), &appl::Windows::onCallbackChangeValues);
subBind(ewol::widget::Button, "bt-auto", signalPressed, shared_from_this(), &appl::Windows::onCallbackAutoMode); subBind(ewol::widget::Button, "bt-auto", signalPressed, sharedFromThis(), &appl::Windows::onCallbackAutoMode);
} }
void appl::Windows::onCallbackChangeValues() { void appl::Windows::onCallbackChangeValues() {
@ -53,14 +53,14 @@ void appl::Windows::onCallbackChangeValues() {
for (int32_t iii=0; iii<2048; ++iii) { for (int32_t iii=0; iii<2048; ++iii) {
tmp.push_back(etk::tool::frand(-1.0, 1.0)); tmp.push_back(etk::tool::frand(-1.0, 1.0));
} }
std::shared_ptr<appl::widget::VectorDisplay> tmpDisp = std::dynamic_pointer_cast<appl::widget::VectorDisplay>(getSubObjectNamed("displayer")); ememory::SharedPtr<appl::widget::VectorDisplay> tmpDisp = ememory::dynamicPointerCast<appl::widget::VectorDisplay>(getSubObjectNamed("displayer"));
if (tmpDisp != nullptr) { if (tmpDisp != nullptr) {
tmpDisp->setValue(tmp); tmpDisp->setValue(tmp);
} }
} }
void appl::Windows::onCallbackAutoMode() { void appl::Windows::onCallbackAutoMode() {
std::shared_ptr<appl::widget::VectorDisplay> tmpDisp = std::dynamic_pointer_cast<appl::widget::VectorDisplay>(getSubObjectNamed("displayer")); ememory::SharedPtr<appl::widget::VectorDisplay> tmpDisp = ememory::dynamicPointerCast<appl::widget::VectorDisplay>(getSubObjectNamed("displayer"));
if (tmpDisp != nullptr) { if (tmpDisp != nullptr) {
tmpDisp->ToggleAuto(); tmpDisp->ToggleAuto();
} }

2
sample/CustomWidgets/appl/widget/VectorDisplay.cpp
View File

@ -20,7 +20,7 @@ void appl::widget::VectorDisplay::init() {
ewol::Widget::init(); ewol::Widget::init();
markToRedraw(); markToRedraw();
// set call all time (sample ...). // set call all time (sample ...).
getObjectManager().periodicCall.connect(shared_from_this(), &appl::widget::VectorDisplay::periodicEvent); getObjectManager().periodicCall.connect(sharedFromThis(), &appl::widget::VectorDisplay::periodicEvent);
} }

2
test/testWindows.cpp
View File

@ -27,7 +27,7 @@ namespace appl {
TEST(TestEwolWindows, Creation) { TEST(TestEwolWindows, Creation) {
/* /*
std::shared_ptr<appl::Windows> tmpWindows = appl::Windows::create(); ememory::SharedPtr<appl::Windows> tmpWindows = appl::Windows::create();
EXPECT_NE(tmpWindows, nullptr); EXPECT_NE(tmpWindows, nullptr);
tmpWindows.reset(); tmpWindows.reset();
*/ */

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

@ -41,25 +41,25 @@ void appl::MainWindows::init() {
m_composer = ewol::widget::Composer::create(); m_composer = ewol::widget::Composer::create();
m_composer->loadFromFile("DATA:gui.xml"); m_composer->loadFromFile("DATA:gui.xml");
setSubWidget(m_composer); setSubWidget(m_composer);
externSubBind(m_composer, ewol::widget::Button, "appl-theme-toggle", signalValue, shared_from_this(), &appl::MainWindows::onCallbackThemeChange); externSubBind(m_composer, ewol::widget::Button, "appl-theme-toggle", signalValue, sharedFromThis(), &appl::MainWindows::onCallbackThemeChange);
externSubBind(m_composer, ewol::widget::Button, "appl-previous-widget", signalPressed, shared_from_this(), &appl::MainWindows::onCallbackWidgetChange, -1); externSubBind(m_composer, ewol::widget::Button, "appl-previous-widget", signalPressed, sharedFromThis(), &appl::MainWindows::onCallbackWidgetChange, -1);
externSubBind(m_composer, ewol::widget::Button, "appl-next-widget", signalPressed, shared_from_this(), &appl::MainWindows::onCallbackWidgetChange, 1); externSubBind(m_composer, ewol::widget::Button, "appl-next-widget", signalPressed, sharedFromThis(), &appl::MainWindows::onCallbackWidgetChange, 1);
externSubBind(m_composer, ewol::widget::Button, "appl-next-gravity", signalPressed, shared_from_this(), &appl::MainWindows::onCallbackGravityChange); externSubBind(m_composer, ewol::widget::Button, "appl-next-gravity", signalPressed, sharedFromThis(), &appl::MainWindows::onCallbackGravityChange);
m_sizerVert = std::dynamic_pointer_cast<ewol::widget::Sizer>(m_composer->getSubObjectNamed("appl-upper-test-widget")); m_sizerVert = ememory::dynamicPointerCast<ewol::widget::Sizer>(m_composer->getSubObjectNamed("appl-upper-test-widget"));
if (m_sizerVert == nullptr) { if (m_sizerVert == nullptr) {
APPL_CRITICAL("Can not get vertical pointer"); APPL_CRITICAL("Can not get vertical pointer");
} }
m_sizerDynamic = std::dynamic_pointer_cast<ewol::widget::Sizer>(m_composer->getSubObjectNamed("appl-dynamic-config")); m_sizerDynamic = ememory::dynamicPointerCast<ewol::widget::Sizer>(m_composer->getSubObjectNamed("appl-dynamic-config"));
if (m_sizerDynamic == nullptr) { if (m_sizerDynamic == nullptr) {
APPL_CRITICAL("Can not get dynamic pointer"); APPL_CRITICAL("Can not get dynamic pointer");
} }
m_subWidget = std::dynamic_pointer_cast<ewol::Widget>(m_composer->getSubObjectNamed("[TEST]TO-TEST")); m_subWidget = ememory::dynamicPointerCast<ewol::Widget>(m_composer->getSubObjectNamed("[TEST]TO-TEST"));
if (m_subWidget == nullptr) { if (m_subWidget == nullptr) {
APPL_CRITICAL("Can not get subWidget pointer"); APPL_CRITICAL("Can not get subWidget pointer");
} }
shortCutAdd("F12", "menu:reloade-shader"); shortCutAdd("F12", "menu:reloade-shader");
signalShortcut.connect(shared_from_this(), &appl::MainWindows::onCallbackShortCut); signalShortcut.connect(sharedFromThis(), &appl::MainWindows::onCallbackShortCut);
} }
void appl::MainWindows::onCallbackShortCut(const std::string& _value) { void appl::MainWindows::onCallbackShortCut(const std::string& _value) {
@ -119,7 +119,7 @@ void appl::MainWindows::onCallbackGravityChange() {
void appl::MainWindows::onCallbackWidgetChange(int32_t _increment) { void appl::MainWindows::onCallbackWidgetChange(int32_t _increment) {
m_idWidget += _increment; m_idWidget += _increment;
std::shared_ptr<ewol::Widget> oldWidget = m_subWidget; ememory::SharedPtr<ewol::Widget> oldWidget = m_subWidget;
std::string tmpDescription; std::string tmpDescription;
std::string tmpConstruct; std::string tmpConstruct;
switch(m_idWidget) { switch(m_idWidget) {
@ -194,8 +194,8 @@ void appl::MainWindows::onCallbackWidgetChange(int32_t _increment) {
updateProperty(); updateProperty();
} }
static void addSpacer(const std::shared_ptr<ewol::widget::Sizer>& _sizer, etk::Color<> _color=etk::color::none) { static void addSpacer(const ememory::SharedPtr<ewol::widget::Sizer>& _sizer, etk::Color<> _color=etk::color::none) {
std::shared_ptr<ewol::widget::Spacer> mySpacer = ewol::widget::Spacer::create(); ememory::SharedPtr<ewol::widget::Spacer> mySpacer = ewol::widget::Spacer::create();
if (mySpacer != nullptr) { if (mySpacer != nullptr) {
mySpacer->propertyExpand.set(bvec2(true,false)); mySpacer->propertyExpand.set(bvec2(true,false));
mySpacer->propertyFill.set(bvec2(true,false)); mySpacer->propertyFill.set(bvec2(true,false));
@ -214,7 +214,7 @@ void appl::MainWindows::updateProperty() {
return; return;
} }
m_listConnection.clear(); m_listConnection.clear();
std::shared_ptr<ewol::widget::Label> widget = ewol::widget::Label::create(); ememory::SharedPtr<ewol::widget::Label> widget = ewol::widget::Label::create();
widget->propertyValue.set(m_subWidget->getObjectType()); widget->propertyValue.set(m_subWidget->getObjectType());
m_sizerDynamic->subWidgetAdd(widget); m_sizerDynamic->subWidgetAdd(widget);
addSpacer(m_sizerDynamic, etk::color::red); addSpacer(m_sizerDynamic, etk::color::red);
@ -224,13 +224,13 @@ void appl::MainWindows::updateProperty() {
APPL_WARNING("Parameter EMPTY . " << iii << " : nullptr"); APPL_WARNING("Parameter EMPTY . " << iii << " : nullptr");
continue; continue;
} }
std::shared_ptr<ewol::widget::Sizer> widgetSizer = ewol::widget::Sizer::create(); ememory::SharedPtr<ewol::widget::Sizer> widgetSizer = ewol::widget::Sizer::create();
if (widgetSizer != nullptr) { if (widgetSizer != nullptr) {
widgetSizer->propertyMode.set(ewol::widget::Sizer::modeHori); widgetSizer->propertyMode.set(ewol::widget::Sizer::modeHori);
widgetSizer->propertyExpand.set(bvec2(true,false)); widgetSizer->propertyExpand.set(bvec2(true,false));
widgetSizer->propertyFill.set(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(); ememory::SharedPtr<ewol::widget::Label> widget = ewol::widget::Label::create();
widget->propertyValue.set(param->getName() + ":"); widget->propertyValue.set(param->getName() + ":");
widgetSizer->subWidgetAdd(widget); widgetSizer->subWidgetAdd(widget);
std::string type = param->getType(); std::string type = param->getType();

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

@ -55,7 +55,7 @@ class MainApplication : public ewol::context::Application {
void onStart(ewol::Context& _context) { void onStart(ewol::Context& _context) {
APPL_INFO("==> START ... (BEGIN)"); APPL_INFO("==> START ... (BEGIN)");
std::shared_ptr<appl::MainWindows> basicWindows = appl::MainWindows::create(); ememory::SharedPtr<appl::MainWindows> basicWindows = appl::MainWindows::create();
if (basicWindows == nullptr) { if (basicWindows == nullptr) {
APPL_ERROR("Can not allocate the basic windows"); APPL_ERROR("Can not allocate the basic windows");
return; return;