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

[DEV] change scrool in scroll

Browse Source
This commit is contained in:
Edouard DUPIN 2014-01-22 21:29:24 +01:00
parent c50abe2032
commit a2a70607c3
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sources/ewol/widget/List.cpp
View File

@ -99,7 +99,7 @@ void ewol::widget::List::onDraw(void) {
m_listOObject[iii]->draw(); m_listOObject[iii]->draw();
} }
} }
WidgetScrooled::onDraw(); WidgetScrolled::onDraw();
} }
void ewol::widget::List::onRegenerateDisplay(void) { void ewol::widget::List::onRegenerateDisplay(void) {
@ -208,14 +208,14 @@ void ewol::widget::List::onRegenerateDisplay(void) {
addOObject(BGOObjects, 0); addOObject(BGOObjects, 0);
// call the herited class... // call the herited class...
WidgetScrooled::onRegenerateDisplay(); WidgetScrolled::onRegenerateDisplay();
} }
} }
bool ewol::widget::List::onEventInput(const ewol::event::Input& _event) { bool ewol::widget::List::onEventInput(const ewol::event::Input& _event) {
vec2 relativePos = relativePosition(_event.getPos()); vec2 relativePos = relativePosition(_event.getPos());
if (true == WidgetScrooled::onEventInput(_event)) { if (true == WidgetScrolled::onEventInput(_event)) {
keepFocus(); keepFocus();
// nothing to do ... done on upper widet ... // nothing to do ... done on upper widet ...
return true; return true;

2
sources/ewol/widget/List.h
View File

@ -20,7 +20,7 @@ namespace ewol {
/** /**
* @ingroup ewolWidgetGroup * @ingroup ewolWidgetGroup
*/ */
class List : public ewol::widget::WidgetScrooled { class List : public ewol::widget::WidgetScrolled {
public: public:
List(void); List(void);
virtual ~List(void); virtual ~List(void);

18
sources/ewol/widget/WidgetScrolled.cpp
View File

@ -15,10 +15,10 @@
ewol::widget::WidgetScrooled::WidgetScrooled(const std::string& _shaperName) : ewol::widget::WidgetScrolled::WidgetScrolled(const std::string& _shaperName) :
m_shaperH(_shaperName), m_shaperH(_shaperName),
m_shaperV(_shaperName) { m_shaperV(_shaperName) {
addObjectType("ewol::widget::WidgetScrooled"); addObjectType("ewol::widget::WidgetScrolled");
m_originScrooled.setValue(0,0); m_originScrooled.setValue(0,0);
m_pixelScrolling = 20; m_pixelScrolling = 20;
m_highSpeedMode = ewol::widget::Scroll::speedModeDisable; m_highSpeedMode = ewol::widget::Scroll::speedModeDisable;
@ -33,12 +33,12 @@ ewol::widget::WidgetScrooled::WidgetScrooled(const std::string& _shaperName) :
} }
} }
ewol::widget::WidgetScrooled::~WidgetScrooled(void) { ewol::widget::WidgetScrolled::~WidgetScrolled(void) {
} }
void ewol::widget::WidgetScrooled::onRegenerateDisplay(void) { void ewol::widget::WidgetScrolled::onRegenerateDisplay(void) {
m_shaperH.clear(); m_shaperH.clear();
m_shaperV.clear(); m_shaperV.clear();
if (m_scroollingMode == scroolModeGame) { if (m_scroollingMode == scroolModeGame) {
@ -73,7 +73,7 @@ void ewol::widget::WidgetScrooled::onRegenerateDisplay(void) {
} }
} }
bool ewol::widget::WidgetScrooled::onEventInput(const ewol::event::Input& _event) { bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event) {
EWOL_VERBOSE("event XXX " << _event); EWOL_VERBOSE("event XXX " << _event);
vec2 relativePos = relativePosition(_event.getPos()); vec2 relativePos = relativePosition(_event.getPos());
// corection due to the open Gl invertion ... // corection due to the open Gl invertion ...
@ -394,12 +394,12 @@ bool ewol::widget::WidgetScrooled::onEventInput(const ewol::event::Input& _event
} }
void ewol::widget::WidgetScrooled::onDraw(void) { void ewol::widget::WidgetScrolled::onDraw(void) {
m_shaperH.draw(); m_shaperH.draw();
m_shaperV.draw(); m_shaperV.draw();
} }
void ewol::widget::WidgetScrooled::systemDraw(const ewol::DrawProperty& _displayProp) { void ewol::widget::WidgetScrolled::systemDraw(const ewol::DrawProperty& _displayProp) {
ewol::openGL::push(); ewol::openGL::push();
if (m_scroollingMode == scroolModeCenter) { if (m_scroollingMode == scroolModeCenter) {
// here we invert the reference of the standard openGl view because the reference in the common display is Top left and not buttom left // here we invert the reference of the standard openGl view because the reference in the common display is Top left and not buttom left
@ -435,7 +435,7 @@ void ewol::widget::WidgetScrooled::systemDraw(const ewol::DrawProperty& _display
ewol::openGL::pop(); ewol::openGL::pop();
} }
void ewol::widget::WidgetScrooled::setScrollingPositionDynamic(vec2 _borderWidth, const vec2& _currentPosition, bool _center) { void ewol::widget::WidgetScrolled::setScrollingPositionDynamic(vec2 _borderWidth, const vec2& _currentPosition, bool _center) {
if (true == _center) { if (true == _center) {
_borderWidth.setValue(m_size.x() / 2 - _borderWidth.x(), _borderWidth.setValue(m_size.x() / 2 - _borderWidth.x(),
m_size.y() / 2 - _borderWidth.y() ); m_size.y() / 2 - _borderWidth.y() );
@ -458,7 +458,7 @@ void ewol::widget::WidgetScrooled::setScrollingPositionDynamic(vec2 _borderWidth
} }
} }
void ewol::widget::WidgetScrooled::scroolingMode(enum scrollingMode _newMode) { void ewol::widget::WidgetScrolled::scroolingMode(enum scrollingMode _newMode) {
m_scroollingMode = _newMode; m_scroollingMode = _newMode;
if (m_scroollingMode == scroolModeGame) { if (m_scroollingMode == scroolModeGame) {
// set the scene maximum size : // set the scene maximum size :

6
sources/ewol/widget/WidgetScrolled.h
View File

@ -22,7 +22,7 @@ namespace ewol {
/** /**
* @brief Widget to integrate a scrool bar in a widget. This is not a stadalone widget. * @brief Widget to integrate a scrool bar in a widget. This is not a stadalone widget.
*/ */
class WidgetScrooled : public ewol::Widget { class WidgetScrolled : public ewol::Widget {
public: public:
enum scrollingMode { enum scrollingMode {
scroolModeNormal, //!< No Zoom , can UP and down, left and right scroolModeNormal, //!< No Zoom , can UP and down, left and right
@ -52,11 +52,11 @@ namespace ewol {
* @brief Scroll Widget main constructor to be herited from an other widget (this is not a stand-alone widget) * @brief Scroll Widget main constructor to be herited from an other widget (this is not a stand-alone widget)
* @param[in] _shaperName Shaper name if the scrolled widget. * @param[in] _shaperName Shaper name if the scrolled widget.
*/ */
WidgetScrooled(const std::string& _shaperName="THEME:GUI:WidgetScrolled.conf"); WidgetScrolled(const std::string& _shaperName="THEME:GUI:WidgetScrolled.conf");
/** /**
* @brief Scroll widget destructor. * @brief Scroll widget destructor.
*/ */
virtual ~WidgetScrooled(void); virtual ~WidgetScrolled(void);
protected: // Derived function protected: // Derived function
virtual void onDraw(void); virtual void onDraw(void);
public: // Derived function public: // Derived function

6
sources/ewol/widget/meta/ParameterList.cpp
View File

@ -81,7 +81,7 @@ void ewol::widget::ParameterList::onDraw(void) {
m_listOObject[iii]->draw(); m_listOObject[iii]->draw();
} }
} }
WidgetScrooled::onDraw(); WidgetScrolled::onDraw();
} }
void ewol::widget::ParameterList::onRegenerateDisplay(void) { void ewol::widget::ParameterList::onRegenerateDisplay(void) {
@ -162,13 +162,13 @@ void ewol::widget::ParameterList::onRegenerateDisplay(void) {
addOObject(tmpDraw, 0); addOObject(tmpDraw, 0);
// call the herited class... // call the herited class...
ewol::widget::WidgetScrooled::onRegenerateDisplay(); ewol::widget::WidgetScrolled::onRegenerateDisplay();
} }
} }
bool ewol::widget::ParameterList::onEventInput(const ewol::event::Input& _event) { bool ewol::widget::ParameterList::onEventInput(const ewol::event::Input& _event) {
if (true == WidgetScrooled::onEventInput(_event)) { if (true == WidgetScrolled::onEventInput(_event)) {
keepFocus(); keepFocus();
// nothing to do ... done on upper widet ... // nothing to do ... done on upper widet ...
return true; return true;

2
sources/ewol/widget/meta/ParameterList.h
View File

@ -36,7 +36,7 @@ namespace ewol {
/** /**
* @ingroup ewolWidgetGroup * @ingroup ewolWidgetGroup
*/ */
class ParameterList :public ewol::widget::WidgetScrooled { class ParameterList :public ewol::widget::WidgetScrolled {
public: public:
// Event list of properties // Event list of properties
static const char * const eventSelect; static const char * const eventSelect;