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

add imaged button not manage with Drawer widget

Browse Source
This commit is contained in:
Edouard Dupin 2012-06-06 18:20:37 +02:00
parent ccc443c4cf
commit da291e0f22
7 changed files with 455 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Sources/libewol/ewol/OObject/2DTextured.cpp
View File

@ -53,7 +53,6 @@ ewol::OObject2DTextured::~OObject2DTextured(void)
void ewol::OObject2DTextured::Draw(void)
{
if (m_coord.Size()<=0) {
EWOL_WARNING("Nothink to draw...");
return;
}
if (m_textureId == -1) {
@ -75,6 +74,12 @@ void ewol::OObject2DTextured::Draw(void)
glDisable(GL_TEXTURE_2D);
}
void ewol::OObject2DTextured::Clear(void)
{
m_coord.Clear();
m_coordTex.Clear();
}
void ewol::OObject2DTextured::Rectangle(etkFloat_t x, etkFloat_t y, etkFloat_t w, etkFloat_t h, etkFloat_t texX, etkFloat_t texY, etkFloat_t texSX, etkFloat_t texSY)
{
//EWOL_DEBUG("Add rectangle : ...");

1
Sources/libewol/ewol/OObject/2DTextured.h
View File

@ -36,6 +36,7 @@ namespace ewol {
virtual ~OObject2DTextured(void);
public:
virtual void Draw(void);
void Clear(void);
void Rectangle(etkFloat_t x, etkFloat_t y, etkFloat_t w, etkFloat_t h, etkFloat_t texX=0.0, etkFloat_t texY=0.0, etkFloat_t texSX=1.0, etkFloat_t texSY=1.0);
protected:
int32_t m_textureId; //!< texture internal ID

335
Sources/libewol/ewol/widget/ButtonImage.cpp Normal file
View File

@ -0,0 +1,335 @@
/**
*******************************************************************************
* @file ewol/widget/ButtonImage.cpp
* @brief ewol Button Image widget system (Sources)
* @author Edouard DUPIN
* @date 06/06/2012
* @par Project
* ewol
*
* @par Copyright
* Copyright 2011 Edouard DUPIN, all right reserved
*
* This software is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY.
*
* Licence summary :
* You can modify and redistribute the sources code and binaries.
* You can send me the bug-fix
*
* Term of the licence in in the file licence.txt.
*
*******************************************************************************
*/
#include <ewol/widget/ButtonImage.h>
#include <ewol/OObject.h>
#include <ewol/WidgetManager.h>
/**
* @brief Initilise the basic widget property ==> due to the android system
* @note all widget that have template might have this initializer ...
* @param ---
* @return ---
*/
void ewol::WIDGET_ButtonImageInit(void)
{
}
#undef __class__
#define __class__ "ButtonImage"
ewol::ButtonImage::ButtonImage(etk::UString newLabel)
{
AddEventId(ewolEventButtonPressed);
AddEventId(ewolEventButtonDown);
AddEventId(ewolEventButtonUp);
AddEventId(ewolEventButtonEnter);
AddEventId(ewolEventButtonLeave);
SetMinSize(10,10);
SetCanHaveFocus(true);
m_over = false;
m_down = false;
m_value = false;
for (int32_t iii=0; iii<NB_BOUBLE_BUFFER; iii++) {
m_OOImage[iii] = NULL;
m_OOImageBg1[iii] = NULL;
m_OOImageBG2[iii] = NULL;
m_resetNeeded[iii] = false;
}
}
ewol::ButtonImage::~ButtonImage(void)
{
}
void ewol::ButtonImage::SetImage(etk::UString imageName)
{
m_image = imageName;
for (int32_t iii=0; iii<NB_BOUBLE_BUFFER; iii++) {
m_resetNeeded[iii] = true;
}
MarkToReedraw();
}
void ewol::ButtonImage::SetImageBG(etk::UString imageName)
{
m_imageBg1 = imageName;
for (int32_t iii=0; iii<NB_BOUBLE_BUFFER; iii++) {
m_resetNeeded[iii] = true;
}
MarkToReedraw();
}
void ewol::ButtonImage::SetImageSelected(etk::UString imageName)
{
m_imageBg2 = imageName;
for (int32_t iii=0; iii<NB_BOUBLE_BUFFER; iii++) {
m_resetNeeded[iii] = true;
}
MarkToReedraw();
}
//!< EObject name :
extern const char * const ewol::TYPE_EOBJECT_WIDGET_BUTTON_IMAGE = "ButtonImage";
/**
* @brief Check if the object has the specific type.
* @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it
* @param[in] objectType type of the object we want to check
* @return true if the object is compatible, otherwise false
*/
bool ewol::ButtonImage::CheckObjectType(const char * const objectType)
{
if (NULL == objectType) {
EWOL_ERROR("check error : \"" << ewol::TYPE_EOBJECT_WIDGET_BUTTON_IMAGE << "\" != NULL(pointer) ");
return false;
}
if (objectType == ewol::TYPE_EOBJECT_WIDGET_BUTTON_IMAGE) {
return true;
} else {
if(true == ewol::Widget::CheckObjectType(objectType)) {
return true;
}
EWOL_ERROR("check error : \"" << ewol::TYPE_EOBJECT_WIDGET_BUTTON_IMAGE << "\" != \"" << objectType << "\"");
return false;
}
}
/**
* @brief Get the current Object type of the EObject
* @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it
* @param[in] objectType type description
* @return true if the object is compatible, otherwise false
*/
const char * const ewol::ButtonImage::GetObjectType(void)
{
return ewol::TYPE_EOBJECT_WIDGET_BUTTON_IMAGE;
}
void ewol::ButtonImage::SetValue(bool val)
{
}
bool ewol::ButtonImage::GetValue(void)
{
return false;
}
void ewol::ButtonImage::OnRegenerateDisplay(void)
{
if (true == NeedRedraw()) {
int32_t tmpSizeX = m_minSize.x;
int32_t tmpSizeY = m_minSize.y;
int32_t tmpOriginX = (m_size.x - m_minSize.x) / 2;
int32_t tmpOriginY = (m_size.y - m_minSize.y) / 2;
if (true==m_userFillX) {
tmpSizeX = m_size.x;
tmpOriginX = 0;
}
if (true==m_userFillY) {
tmpSizeY = m_size.y;
tmpOriginY = 0;
}
if (NULL == m_OOImageBG2[m_currentCreateId]) {
if(m_imageBg2 != "") {
m_OOImageBG2[m_currentCreateId] = new ewol::OObject2DTextured(m_imageBg2, tmpSizeX, tmpSizeY);
}
}
if (NULL == m_OOImageBg1[m_currentCreateId]) {
if(m_imageBg1 != "") {
m_OOImageBg1[m_currentCreateId] = new ewol::OObject2DTextured(m_imageBg1, tmpSizeX, tmpSizeY);
}
}
if (NULL == m_OOImage[m_currentCreateId]) {
if(m_image != "") {
m_OOImage[m_currentCreateId] = new ewol::OObject2DTextured(m_image, tmpSizeX, tmpSizeY);
}
}
if (NULL != m_OOImageBG2[m_currentCreateId]) {
m_OOImageBG2[m_currentCreateId]->Clear();
if( m_down == true
|| m_over == true ) {
m_OOImageBG2[m_currentCreateId]->Rectangle(tmpOriginX, tmpOriginY, tmpSizeX, tmpSizeY);
}
}
etkFloat_t tmpval = tmpSizeX * 0.2;
tmpSizeX -= tmpval;
tmpOriginX += tmpval/2;
tmpval = tmpSizeY * 0.2;
tmpSizeY -= tmpval;
tmpOriginY += tmpval/2;
if (NULL != m_OOImageBg1[m_currentCreateId]) {
m_OOImageBg1[m_currentCreateId]->Clear();
m_OOImageBg1[m_currentCreateId]->Rectangle(tmpOriginX, tmpOriginY, tmpSizeX, tmpSizeY);
tmpval = tmpSizeX * 0.2;
tmpSizeX -= tmpval;
tmpOriginX += tmpval/2;
tmpval = tmpSizeY * 0.2;
tmpSizeY -= tmpval;
tmpOriginY += tmpval/2;
}
if (NULL != m_OOImage[m_currentCreateId]) {
m_OOImage[m_currentCreateId]->Clear();
m_OOImage[m_currentCreateId]->Rectangle(tmpOriginX, tmpOriginY, tmpSizeX, tmpSizeY);
}
m_needFlipFlop = true;
}
}
/**
* @brief Event on an input of this Widget
* @param[in] type Type of the input (ewol::INPUT_TYPE_MOUSE/ewol::INPUT_TYPE_FINGER ...)
* @param[in] IdInput Id of the current Input (PC : left=1, right=2, middle=3, none=0 / Tactil : first finger=1 , second=2 (only on this widget, no knowledge at ouside finger))
* @param[in] typeEvent ewol type of event like EVENT_INPUT_TYPE_DOWN/EVENT_INPUT_TYPE_MOVE/EVENT_INPUT_TYPE_UP/EVENT_INPUT_TYPE_SINGLE/EVENT_INPUT_TYPE_DOUBLE/...
* @param[in] pos Absolute position of the event
* @return true the event is used
* @return false the event is not used
*/
bool ewol::ButtonImage::OnEventInput(ewol::inputType_te type, int32_t IdInput, eventInputType_te typeEvent, coord2D_ts pos)
{
//EWOL_DEBUG("Event on BT ...");
if (1 == IdInput) {
if(ewol::EVENT_INPUT_TYPE_DOWN == typeEvent) {
GenerateEventId(ewolEventButtonDown);
m_down = true;
m_value = true;
MarkToReedraw();
}
if(ewol::EVENT_INPUT_TYPE_UP == typeEvent) {
GenerateEventId(ewolEventButtonUp);
m_down = false;
m_value = false;
MarkToReedraw();
}
if( ewol::EVENT_INPUT_TYPE_SINGLE == typeEvent
|| ewol::EVENT_INPUT_TYPE_DOUBLE == typeEvent
|| ewol::EVENT_INPUT_TYPE_TRIPLE == typeEvent) {
GenerateEventId(ewolEventButtonPressed);
MarkToReedraw();
return true;
}
} else if (0 == IdInput) {
if(ewol::EVENT_INPUT_TYPE_MOVE == typeEvent) {
coord2D_ts relPos = RelativePosition(pos);
// check if over :
int32_t tmpSizeX = m_minSize.x;
int32_t tmpSizeY = m_minSize.y;
int32_t tmpOriginX = (m_size.x - m_minSize.x) / 2;
int32_t tmpOriginY = (m_size.y - m_minSize.y) / 2;
if (true==m_userFillX) {
tmpSizeX = m_size.x;
tmpOriginX = 0;
}
if (true==m_userFillY) {
tmpSizeY = m_size.y;
tmpOriginY = 0;
}
if( relPos.x > tmpOriginX
&& relPos.x < tmpOriginX+tmpSizeX
&& relPos.y > tmpOriginY
&& relPos.y < tmpOriginY+tmpSizeY ) {
if (m_over != true) {
m_over = true;
MarkToReedraw();
}
} else {
if(m_over != false) {
m_over = false;
MarkToReedraw();
}
}
}
}
return false;
}
bool ewol::ButtonImage::OnEventKb(ewol::eventKbType_te typeEvent, uniChar_t unicodeData)
{
//EWOL_DEBUG("BT PRESSED : \"" << UTF8_data << "\" size=" << strlen(UTF8_data));
if( typeEvent == ewol::EVENT_KB_TYPE_DOWN
&& unicodeData == '\r') {
GenerateEventId(ewolEventButtonEnter);
}
return false;
}
void ewol::ButtonImage::OnDraw(void)
{
if (NULL != m_OOImageBG2[m_currentDrawId]) {
m_OOImageBG2[m_currentDrawId]->Draw();
}
if (NULL != m_OOImageBg1[m_currentDrawId]) {
m_OOImageBg1[m_currentDrawId]->Draw();
}
if (NULL != m_OOImage[m_currentDrawId]) {
m_OOImage[m_currentDrawId]->Draw();
}
}
/**
* @brief Event generated to inform a flip-flop has occured on the current widget
* @param ---
* @return ---
*/
void ewol::ButtonImage::OnFlipFlopEvent(void)
{
bool needFlipFlop = m_needFlipFlop;
// call herited classes
ewol::Widget::OnFlipFlopEvent();
// internal saving
if (true == needFlipFlop) {
if (m_resetNeeded[m_currentCreateId] == true) {
m_resetNeeded[m_currentCreateId] == false;
if (NULL != m_OOImageBG2[m_currentCreateId]) {
delete(m_OOImageBG2[m_currentCreateId]);
m_OOImageBG2[m_currentCreateId] = NULL;
}
if (NULL != m_OOImageBg1[m_currentCreateId]) {
delete(m_OOImageBg1[m_currentCreateId]);
m_OOImageBg1[m_currentCreateId] = NULL;
}
if (NULL != m_OOImage[m_currentCreateId]) {
delete(m_OOImage[m_currentCreateId]);
m_OOImage[m_currentCreateId] = NULL;
}
}
}
}

107
Sources/libewol/ewol/widget/ButtonImage.h Normal file
View File

@ -0,0 +1,107 @@
/**
*******************************************************************************
* @file ewol/widget/ButtonImage.h
* @brief ewol Button Image widget system (header)
* @author Edouard DUPIN
* @date 06/06/2012
* @par Project
* ewol
*
* @par Copyright
* Copyright 2011 Edouard DUPIN, all right reserved
*
* This software is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY.
*
* Licence summary :
* You can modify and redistribute the sources code and binaries.
* You can send me the bug-fix
*
* Term of the licence in in the file licence.txt.
*
*******************************************************************************
*/
#ifndef __EWOL_BUTTON_IMAGE_H__
#define __EWOL_BUTTON_IMAGE_H__
#include <etk/Types.h>
#include <ewol/Debug.h>
#include <ewol/Widget.h>
#include <ewol/widget/Button.h>
namespace ewol {
class ButtonImage :public ewol::Widget
{
public:
ButtonImage(etk::UString image);
/**
* @brief Check if the object has the specific type.
* @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it
* @param[in] objectType type of the object we want to check
* @return true if the object is compatible, otherwise false
*/
virtual bool CheckObjectType(const char * const objectType);
/**
* @brief Get the current Object type of the EObject
* @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it
* @param[in] objectType type description
* @return true if the object is compatible, otherwise false
*/
virtual const char * const GetObjectType(void);
void Init(void);
virtual ~ButtonImage(void);
void SetImage(etk::UString imageName);
void SetImageBG(etk::UString imageName);
void SetImageSelected(etk::UString imageName);
void SetValue(bool val);
bool GetValue(void);
private:
etk::UString m_image;
bool m_resetNeeded[NB_BOUBLE_BUFFER];
ewol::OObject2DTextured* m_OOImage[NB_BOUBLE_BUFFER];
etk::UString m_imageBg1;
ewol::OObject2DTextured* m_OOImageBg1[NB_BOUBLE_BUFFER];
etk::UString m_imageBg2;
ewol::OObject2DTextured* m_OOImageBG2[NB_BOUBLE_BUFFER];
bool m_over;
bool m_down;
bool m_value;
public:
virtual void OnRegenerateDisplay(void);
public:
/**
* @brief Event on an input of this Widget
* @param[in] type Type of the input (ewol::INPUT_TYPE_MOUSE/ewol::INPUT_TYPE_FINGER ...)
* @param[in] IdInput Id of the current Input (PC : left=1, right=2, middle=3, none=0 / Tactil : first finger=1 , second=2 (only on this widget, no knowledge at ouside finger))
* @param[in] typeEvent ewol type of event like EVENT_INPUT_TYPE_DOWN/EVENT_INPUT_TYPE_MOVE/EVENT_INPUT_TYPE_UP/EVENT_INPUT_TYPE_SINGLE/EVENT_INPUT_TYPE_DOUBLE/...
* @param[in] pos Absolute position of the event
* @return true the event is used
* @return false the event is not used
*/
virtual bool OnEventInput(ewol::inputType_te type, int32_t IdInput, eventInputType_te typeEvent, coord2D_ts pos);
virtual bool OnEventKb(ewol::eventKbType_te typeEvent, uniChar_t unicodeData);
/**
* @brief Event generated to inform a flip-flop has occured on the current widget
* @param ---
* @return ---
*/
virtual void OnFlipFlopEvent(void);
virtual void OnDraw(void);
};
/**
* @brief Initilise the basic widget property ==> due to the android system
* @note all widget that have template might have this initializer ...
* @param ---
* @return ---
*/
void WIDGET_ButtonImageInit(void);
extern const char * const TYPE_EOBJECT_WIDGET_BUTTON_IMAGE;
};
#define EWOL_CAST_WIDGET_BUTTON_IMAGE(curentPointer) EWOL_CAST(ewol::TYPE_EOBJECT_WIDGET_BUTTON_IMAGE,ewol::ButtonImage,curentPointer)
#endif

2
Sources/libewol/ewol/widget/Scene.cpp
View File

@ -118,6 +118,7 @@ void ewol::Scene::OnRegenerateDisplay(void)
}
}
}
m_needFlipFlop = true;
}
}
@ -144,7 +145,6 @@ void ewol::Scene::OnDraw(void)
m_sceneElement.effects[m_currentDrawId][iii]->Draw();
}
}
m_needFlipFlop = true;
}

1
Sources/libewol/file.mk
View File

@ -28,6 +28,7 @@ FILE_LIST = ewol/ewol.cpp \
ewol/Windows.cpp \
ewol/ShortCutManager.cpp \
ewol/widget/Button.cpp \
ewol/widget/ButtonImage.cpp \
ewol/widget/Image.cpp \
ewol/widget/ButtonColor.cpp \
ewol/widget/CheckBox.cpp \

5
Sources/libparsersvg/parserSVG/Polygon.cpp
View File

@ -60,11 +60,14 @@ bool svg::Polygon::Parse(TiXmlNode * node, agg::trans_affine& parentTrans, coord
while ('\0' != sss[0]) {
coord2D_ts pos;
int32_t n;
if (sscanf(sss, "%f,%f %n", &pos.x, &pos.y, &n) == 2) {
if (sscanf(sss, "%f,%f%n", &pos.x, &pos.y, &n) == 2) {
m_listPoint.PushBack(pos);
sss += n;
sizeMax.x = etk_max(sizeMax.x, pos.x);
sizeMax.y = etk_max(sizeMax.y, pos.y);
if(sss[0] == ' ' || sss[0] == ',') {
sss++;
}
} else {
break;
}