orthograph correction of redraw

This commit is contained in:
Edouard DUPIN 2012-08-14 08:58:43 +02:00
parent c91eb1bece
commit ea19353387
27 changed files with 99 additions and 99 deletions

View File

@ -123,7 +123,7 @@ ewol::Widget::~Widget(void)
void ewol::Widget::Hide(void)
{
m_hide = true;
MarkToReedraw();
MarkToRedraw();
ewol::RequestUpdateSize();
}
@ -136,7 +136,7 @@ void ewol::Widget::Hide(void)
void ewol::Widget::Show(void)
{
m_hide = false;
MarkToReedraw();
MarkToRedraw();
ewol::RequestUpdateSize();
}
@ -152,7 +152,7 @@ bool ewol::Widget::CalculateSize(float availlableX, float availlableY)
{
m_size.x = availlableX;
m_size.y = availlableY;
MarkToReedraw();
MarkToRedraw();
return true;
}
@ -297,7 +297,7 @@ void ewol::Widget::PeriodicCallSet(bool statusToSet)
* @param ---
* @return ---
*/
void ewol::Widget::MarkToReedraw(void)
void ewol::Widget::MarkToRedraw(void)
{
m_needRegenerateDisplay = true;
ewol::widgetManager::MarkDrawingIsNeeded();

View File

@ -179,7 +179,7 @@ namespace ewol {
* @return ---
*/
// TODO : Remove bool ==> deprecated ...
virtual bool CalculateMinSize(void) {m_minSize.x = m_userMinSize.x; m_minSize.y = m_userMinSize.y; MarkToReedraw(); return true; };
virtual bool CalculateMinSize(void) {m_minSize.x = m_userMinSize.x; m_minSize.y = m_userMinSize.y; MarkToRedraw(); return true; };
/**
* @brief User set the minimum size he want to set the display
* @param[in] x Set minimum horizontal size (-1 : no requested)
@ -415,7 +415,7 @@ namespace ewol {
* @param ---
* @return ---
*/
void MarkToReedraw(void);
void MarkToRedraw(void);
/**
* @brief Get the need of the redrawing of the widget and reset it to false
* @param ---

View File

@ -101,7 +101,7 @@ void ewol::Button::SetImage(etk::UString imageName)
m_imageSelected = imageName;
m_hasAnImage = true;
}
MarkToReedraw();
MarkToRedraw();
}
@ -124,7 +124,7 @@ bool ewol::Button::CalculateMinSize(void)
m_minSize.x += m_padding.x + minHeight;
}
MarkToReedraw();
MarkToRedraw();
return true;
}
@ -132,7 +132,7 @@ bool ewol::Button::CalculateMinSize(void)
void ewol::Button::SetLabel(etk::UString newLabel)
{
m_label = newLabel;
MarkToReedraw();
MarkToRedraw();
}
void ewol::Button::SetValue(bool val)
@ -143,7 +143,7 @@ void ewol::Button::SetValue(bool val)
void ewol::Button::SetAlignement(textAlignement_te typeAlign)
{
m_alignement = typeAlign;
MarkToReedraw();
MarkToRedraw();
}
@ -251,7 +251,7 @@ bool ewol::Button::OnEventInput(ewol::inputType_te type, int32_t IdInput, eventI
|| ewol::EVENT_INPUT_TYPE_DOUBLE == typeEvent
|| ewol::EVENT_INPUT_TYPE_TRIPLE == typeEvent) {
GenerateEventId(ewolEventButtonPressed);
MarkToReedraw();
MarkToRedraw();
return true;
}
}

View File

@ -100,7 +100,7 @@ bool ewol::ButtonColor::CalculateMinSize(void)
int32_t minHeight = ewol::GetHeight(fontId);
m_minSize.x = m_padding.x*2 + minWidth;
m_minSize.y = m_padding.y*2 + minHeight;
MarkToReedraw();
MarkToRedraw();
return true;
}
@ -108,7 +108,7 @@ bool ewol::ButtonColor::CalculateMinSize(void)
void ewol::ButtonColor::SetLabel(etk::UString newLabel)
{
m_label = newLabel;
MarkToReedraw();
MarkToRedraw();
}
void ewol::ButtonColor::SetValue(bool val)
@ -119,7 +119,7 @@ void ewol::ButtonColor::SetValue(bool val)
void ewol::ButtonColor::SetAlignement(textAlignement_te typeAlign)
{
m_alignement = typeAlign;
MarkToReedraw();
MarkToRedraw();
}
@ -238,7 +238,7 @@ bool ewol::ButtonColor::OnEventInput(ewol::inputType_te type, int32_t IdInput, e
m_widgetContextMenu->SubWidgetSet(myColorChooser);
myColorChooser->RegisterOnEvent(this, ewolEventColorChooserChange, ewolEventColorChooserChange);
ewol::PopUpWidgetPush(m_widgetContextMenu);
MarkToReedraw();
MarkToRedraw();
return true;
}

View File

@ -73,7 +73,7 @@ void ewol::ButtonImage::SetImage(etk::UString imageName, color_ts col)
m_image = imageName;
m_color = col;
m_resetNeeded = true;
MarkToReedraw();
MarkToRedraw();
}
void ewol::ButtonImage::SetImageBG(etk::UString imageName, color_ts col)
@ -81,7 +81,7 @@ void ewol::ButtonImage::SetImageBG(etk::UString imageName, color_ts col)
m_imageBg1 = imageName;
m_colorBg1 = col;
m_resetNeeded = true;
MarkToReedraw();
MarkToRedraw();
}
void ewol::ButtonImage::SetImageSelected(etk::UString imageName, color_ts col)
@ -89,7 +89,7 @@ void ewol::ButtonImage::SetImageSelected(etk::UString imageName, color_ts col)
m_imageBg2 = imageName;
m_colorBg2 = col;
m_resetNeeded = true;
MarkToReedraw();
MarkToRedraw();
}
@ -97,7 +97,7 @@ void ewol::ButtonImage::SetValue(bool val)
{
if (true == m_toggleMode) {
m_value = val;
MarkToReedraw();
MarkToRedraw();
}
}
@ -112,7 +112,7 @@ void ewol::ButtonImage::SetToggleMode(bool val)
if (m_toggleMode == false) {
m_value = false;
}
MarkToReedraw();
MarkToRedraw();
}
bool ewol::ButtonImage::GetToggleMode(void)
@ -223,7 +223,7 @@ bool ewol::ButtonImage::OnEventInput(ewol::inputType_te type, int32_t IdInput, e
}
GenerateEventId(ewolEventButtonDown, (m_value)?"true":"false");
MarkToReedraw();
MarkToRedraw();
}
if(ewol::EVENT_INPUT_TYPE_UP == typeEvent) {
m_down = false;
@ -231,7 +231,7 @@ bool ewol::ButtonImage::OnEventInput(ewol::inputType_te type, int32_t IdInput, e
m_value = false;
}
GenerateEventId(ewolEventButtonUp, (m_value)?"true":"false");
MarkToReedraw();
MarkToRedraw();
}
if( ewol::EVENT_INPUT_TYPE_SINGLE == typeEvent
|| ewol::EVENT_INPUT_TYPE_DOUBLE == typeEvent
@ -240,7 +240,7 @@ bool ewol::ButtonImage::OnEventInput(ewol::inputType_te type, int32_t IdInput, e
m_value = (true==m_value) ? false : true;
}
GenerateEventId(ewolEventButtonPressed, (m_value)?"true":"false");
MarkToReedraw();
MarkToRedraw();
return true;
}
} else if (0 == IdInput) {
@ -268,13 +268,13 @@ bool ewol::ButtonImage::OnEventInput(ewol::inputType_te type, int32_t IdInput, e
&& relPos.y < tmpOriginY+tmpSizeY ) {
if (m_over != true) {
m_over = true;
MarkToReedraw();
MarkToRedraw();
}
}
} else if(ewol::EVENT_INPUT_TYPE_LEAVE == typeEvent) {
if(m_over != false) {
m_over = false;
MarkToReedraw();
MarkToRedraw();
}
}
}

View File

@ -72,7 +72,7 @@ bool ewol::CheckBox::CalculateMinSize(void)
float boxSize = etk_max(20, minHeight) + 5;
m_minSize.x = boxSize+minWidth;
m_minSize.y = etk_max(boxSize, minHeight)+3;
MarkToReedraw();
MarkToRedraw();
return true;
}
@ -88,7 +88,7 @@ void ewol::CheckBox::SetValue(bool val)
return;
}
m_value = val;
MarkToReedraw();
MarkToRedraw();
}
bool ewol::CheckBox::GetValue(void)
@ -165,7 +165,7 @@ bool ewol::CheckBox::OnEventInput(ewol::inputType_te type, int32_t IdInput, even
GenerateEventId(ewolEventCheckBoxClicked, "true");
}
ewol::widgetManager::FocusKeep(this);
MarkToReedraw();
MarkToRedraw();
return true;
}
}
@ -187,7 +187,7 @@ bool ewol::CheckBox::OnEventKb(eventKbType_te typeEvent, uniChar_t unicodeData)
m_value = true;
GenerateEventId(ewolEventCheckBoxClicked, "true");
}
MarkToReedraw();
MarkToRedraw();
return true;
}
return false;

View File

@ -62,7 +62,7 @@ bool ewol::ColorBar::CalculateMinSize(void)
{
m_minSize.x = 80;
m_minSize.y = 80;
MarkToReedraw();
MarkToRedraw();
return true;
}
static color_ts s_listColorWhite(0xFFFFFFFF);
@ -233,7 +233,7 @@ bool ewol::ColorBar::OnEventInput(ewol::inputType_te type, int32_t IdInput, even
// nothing to do ...
m_currentUserPos.x=relativePos.x/m_size.x;
m_currentUserPos.y=relativePos.y/m_size.y;
MarkToReedraw();
MarkToRedraw();
//==> try to estimate color
EWOL_VERBOSE("event on (" << relativePos.x << "," << relativePos.y << ")");
int32_t bandID = (int32_t)(relativePos.x/(m_size.x/6));

View File

@ -126,7 +126,7 @@ bool ewol::ContextMenu::CalculateSize(float availlableX, float availlableY)
m_subWidget->SetOrigin(subWidgetOrigin.x, subWidgetOrigin.y);
m_subWidget->CalculateSize(subWidgetSize.x, subWidgetSize.y);
}
MarkToReedraw();
MarkToRedraw();
return true;
}
@ -145,7 +145,7 @@ bool ewol::ContextMenu::CalculateMinSize(void)
m_minSize.y = tmpSize.y;
}
EWOL_DEBUG("CalculateMinSize(" << m_minSize.x << "," << m_minSize.y << ")");
MarkToReedraw();
MarkToRedraw();
return true;
}
@ -309,6 +309,6 @@ void ewol::ContextMenu::SetPositionMark(markPosition_te position, Vector2D<float
EWOL_DEBUG("set context menu at the position : (" << arrowPos.x << "," << arrowPos.y << ")");
m_arrawBorder = position;
m_arrowPos = arrowPos;
MarkToReedraw();
MarkToRedraw();
}

View File

@ -63,7 +63,7 @@ ewol::Entry::Entry(void)
Init();
m_data = "";
UpdateTextPosition();
MarkToReedraw();
MarkToRedraw();
}
ewol::Entry::Entry(etk::UString newData)
@ -71,7 +71,7 @@ ewol::Entry::Entry(etk::UString newData)
Init();
SetValue(newData);
UpdateTextPosition();
MarkToReedraw();
MarkToRedraw();
}
@ -88,7 +88,7 @@ bool ewol::Entry::CalculateMinSize(void)
m_minSize.x = m_userSize;
m_minSize.y = minHeight + 2*(m_borderSize + 2*m_paddingSize);
UpdateTextPosition();
MarkToReedraw();
MarkToRedraw();
return true;
}
@ -98,7 +98,7 @@ void ewol::Entry::SetValue(etk::UString newData)
m_data = newData;
m_displayCursorPos = m_data.Size();
EWOL_DEBUG("Set ... " << newData);
MarkToReedraw();
MarkToRedraw();
}
etk::UString ewol::Entry::GetValue(void)
@ -185,7 +185,7 @@ bool ewol::Entry::OnEventInput(ewol::inputType_te type, int32_t IdInput, eventIn
if (ewol::EVENT_INPUT_TYPE_SINGLE == typeEvent) {
GenerateEventId(ewolEventEntryClick);
KeepFocus();
MarkToReedraw();
MarkToRedraw();
Vector2D<float> relPos = RelativePosition(pos);
// try to find the new cursor position :
int32_t fontId = GetDefaultFontId();
@ -251,7 +251,7 @@ bool ewol::Entry::OnEventKb(eventKbType_te typeEvent, uniChar_t unicodeData)
m_displayCursorPos++;
}
GenerateEventId(ewolEventEntryModify, m_data);
MarkToReedraw();
MarkToRedraw();
return true;
}
return false;
@ -284,7 +284,7 @@ bool ewol::Entry::OnEventKbMove(eventKbType_te typeEvent, eventKbMoveType_te mov
return false;
}
m_displayCursorPos = etk_avg(0, m_displayCursorPos, m_data.Size());
MarkToReedraw();
MarkToRedraw();
return true;
}
return false;
@ -313,12 +313,12 @@ void ewol::Entry::OnGetFocus(void)
{
m_displayCursor = true;
ewol::KeyboardShow(ewol::KEYBOARD_MODE_TEXT);
MarkToReedraw();
MarkToRedraw();
}
void ewol::Entry::OnLostFocus(void)
{
m_displayCursor = false;
ewol::KeyboardHide();
MarkToReedraw();
MarkToRedraw();
}

View File

@ -89,7 +89,7 @@ bool ewol::Image::CalculateMinSize(void)
{
m_minSize.x = m_padding.x*2 + m_imageSize;
m_minSize.y = m_padding.y*2 + m_imageSize;
MarkToReedraw();
MarkToRedraw();
return true;
}
@ -97,7 +97,7 @@ bool ewol::Image::CalculateMinSize(void)
void ewol::Image::SetFile(etk::UString newFile)
{
m_imageSelected = newFile;
MarkToReedraw();
MarkToRedraw();
}

View File

@ -140,7 +140,7 @@ bool ewol::Joystick::CalculateSize(float availlableX, float availlableY)
float minimumSize = etk_min(availlableX, availlableY);
m_size.x = minimumSize;
m_size.y = minimumSize;
MarkToReedraw();
MarkToRedraw();
return true;
}
@ -234,7 +234,7 @@ bool ewol::Joystick::OnEventInput(ewol::inputType_te type, int32_t IdInput, even
m_displayPos.x = cos(m_angle)*m_distance;
m_displayPos.y = sin(m_angle)*m_distance;
}
MarkToReedraw();
MarkToRedraw();
if(ewol::EVENT_INPUT_TYPE_DOWN == typeEvent) {
GenerateEventId(ewolEventJoystickEnable);
} else {
@ -254,7 +254,7 @@ bool ewol::Joystick::OnEventInput(ewol::inputType_te type, int32_t IdInput, even
m_angle = -0.1;
m_distance = 0;
}
MarkToReedraw();
MarkToRedraw();
GenerateEventId(ewolEventJoystickDisable);
return true;
}

View File

@ -69,7 +69,7 @@ bool ewol::Label::CalculateMinSize(void)
int32_t minHeight = ewol::GetHeight(fontId);
m_minSize.x = 3+minWidth;
m_minSize.y = 3+minHeight;
MarkToReedraw();
MarkToRedraw();
return true;
}
@ -77,7 +77,7 @@ bool ewol::Label::CalculateMinSize(void)
void ewol::Label::SetLabel(etk::UString newLabel)
{
m_label = newLabel;
MarkToReedraw();
MarkToRedraw();
}

View File

@ -54,7 +54,7 @@ bool ewol::Layer::CalculateSize(float availlableX, float availlableY)
m_subWidget[iii]->CalculateSize(m_size.x, m_size.y);
}
}
MarkToReedraw();
MarkToRedraw();
return true;
}

View File

@ -170,7 +170,7 @@ void ewol::ListFileSystem::RegenerateView(void)
// reorder the files
SortElementList(m_list);
// request a redraw ...
MarkToReedraw();
MarkToRedraw();
}
void ewol::ListFileSystem::SetShowHiddenFiles(bool state)
@ -236,7 +236,7 @@ void ewol::ListFileSystem::SetSelect( etk::UString data) {
}
}
}
MarkToReedraw();
MarkToRedraw();
}
uint32_t ewol::ListFileSystem::GetNuberOfColomn(void) {
@ -280,7 +280,7 @@ bool ewol::ListFileSystem::OnItemEvent(int32_t IdInput, ewol::eventInputType_te
m_selectedLine = raw;
}
// need to regenerate the display of the list :
MarkToReedraw();
MarkToRedraw();
if (previousRaw != m_selectedLine) {
if (m_selectedLine >=0 ) {
// generate event extern :

View File

@ -84,7 +84,7 @@ bool ewol::PopUp::CalculateSize(float availlableX, float availlableY)
m_subWidget->SetOrigin(subWidgetOrigin.x, subWidgetOrigin.y);
m_subWidget->CalculateSize(subWidgetSize.x, subWidgetSize.y);
}
MarkToReedraw();
MarkToRedraw();
return true;
}
@ -103,7 +103,7 @@ bool ewol::PopUp::CalculateMinSize(void)
m_minSize.y = tmpSize.y;
}
//EWOL_DEBUG("CalculateMinSize(" << m_minSize.x << "," << m_minSize.y << ")");
MarkToReedraw();
MarkToRedraw();
return true;
}
@ -132,7 +132,7 @@ void ewol::PopUp::SubWidgetSet(ewol::Widget* newWidget)
SubWidgetRemove();
m_subWidget = newWidget;
//EWOL_DEBUG("SetSubWidget on Pop-Up : " << (int64_t)m_subWidget);
MarkToReedraw();
MarkToRedraw();
}
@ -142,7 +142,7 @@ void ewol::PopUp::SubWidgetRemove(void)
delete(m_subWidget);
m_subWidget = NULL;
}
MarkToReedraw();
MarkToRedraw();
}
@ -212,7 +212,7 @@ ewol::Widget * ewol::PopUp::GetWidgetAtPos(Vector2D<float> pos)
void ewol::PopUp::SetDisplayRatio(float ratio)
{
m_displayRatio = ratio;
MarkToReedraw();
MarkToRedraw();
}

View File

@ -58,7 +58,7 @@ bool ewol::ProgressBar::CalculateMinSize(void)
{
m_minSize.x = etk_max(m_userMinSize.x, 40);
m_minSize.y = etk_max(m_userMinSize.y, dotRadius*2);
MarkToReedraw();
MarkToRedraw();
return true;
}
@ -66,7 +66,7 @@ bool ewol::ProgressBar::CalculateMinSize(void)
void ewol::ProgressBar::ValueSet(float val)
{
m_value = etk_avg(0.0, val, 1.0);
MarkToReedraw();
MarkToRedraw();
}

View File

@ -112,7 +112,7 @@ void ewol::Scene::PeriodicCall(int64_t localTime)
// check if the processing is availlable
if (false == m_isRunning) {
m_lastCallTime = localTime;
MarkToReedraw();
MarkToRedraw();
return;
}
// cut the processing in small slot of time to prevent error in the real-time Display (Android call us between 30 to 60 fps)
@ -135,7 +135,7 @@ void ewol::Scene::PeriodicCall(int64_t localTime)
}
}
}
MarkToReedraw();
MarkToRedraw();
}
/**

View File

@ -89,7 +89,7 @@ bool ewol::SizerHori::CalculateSize(float availlableX, float availlableY)
}
}
}
MarkToReedraw();
MarkToRedraw();
return true;
}

View File

@ -91,7 +91,7 @@ bool ewol::SizerVert::CalculateSize(float availlableX, float availlableY)
}
}
}
MarkToReedraw();
MarkToRedraw();
return true;
}

View File

@ -64,7 +64,7 @@ bool ewol::Slider::CalculateMinSize(void)
{
m_minSize.x = etk_max(m_userMinSize.x, 40);
m_minSize.y = etk_max(m_userMinSize.y, dotRadius*2);
MarkToReedraw();
MarkToRedraw();
return true;
}
@ -72,7 +72,7 @@ bool ewol::Slider::CalculateMinSize(void)
void ewol::Slider::SetValue(int32_t val)
{
m_value = etk_max(etk_min(val, m_max), m_min);
MarkToReedraw();
MarkToRedraw();
}
@ -86,7 +86,7 @@ void ewol::Slider::SetMin(int32_t val)
{
m_min = val;
m_value = etk_max(etk_min(m_value, m_max), m_min);
MarkToReedraw();
MarkToRedraw();
}
@ -94,7 +94,7 @@ void ewol::Slider::SetMax(int32_t val)
{
m_max = val;
m_value = etk_max(etk_min(m_value, m_max), m_min);
MarkToReedraw();
MarkToRedraw();
}
@ -148,7 +148,7 @@ bool ewol::Slider::OnEventInput(ewol::inputType_te type, int32_t IdInput, eventI
if (oldValue != m_value) {
EWOL_DEBUG(" new value : " << m_value << " in [" << m_min << ".." << m_max << "]");
GenerateEventId(ewolEventSliderChange);
MarkToReedraw();
MarkToRedraw();
}
return true;
}

View File

@ -56,7 +56,7 @@ bool ewol::Spacer::CalculateMinSize(void)
void ewol::Spacer::SetSize(float size)
{
m_localSize = size;
MarkToReedraw();
MarkToRedraw();
}
#define BORDER_SIZE_TMP (4)

View File

@ -53,7 +53,7 @@ namespace ewol {
*/
virtual ewol::Widget * GetWidgetAtPos(Vector2D<float> pos) { return NULL; };
virtual void OnRegenerateDisplay(void);
void SetColor(color_ts newColor) { m_color = newColor; MarkToReedraw(); };
void SetColor(color_ts newColor) { m_color = newColor; MarkToRedraw(); };
private:
float m_localSize;
color_ts m_color;

View File

@ -79,7 +79,7 @@ bool ewol::WSlider::CalculateSize(float availlableX, float availlableY)
}
}
}
MarkToReedraw();
MarkToRedraw();
return true;
}
@ -158,7 +158,7 @@ void ewol::WSlider::SubWidgetAdd(ewol::Widget* newWidget)
return;
}
m_subWidget.PushBack(newWidget);
MarkToReedraw();
MarkToRedraw();
ewol::RequestUpdateSize();
}
@ -173,7 +173,7 @@ void ewol::WSlider::SubWidgetRemove(ewol::Widget* newWidget)
delete(m_subWidget[iii]);
m_subWidget[iii] = NULL;
m_subWidget.Erase(iii);
MarkToReedraw();
MarkToRedraw();
ewol::RequestUpdateSize();
return;
}
@ -190,7 +190,7 @@ void ewol::WSlider::SubWidgetUnLink(ewol::Widget* newWidget)
m_subWidget[iii] = NULL;
m_subWidget.Erase(iii);
ewol::RequestUpdateSize();
MarkToReedraw();
MarkToRedraw();
return;
}
}
@ -204,7 +204,7 @@ void ewol::WSlider::SubWidgetSelectSet(int32_t id)
m_windowsDestination = id;
m_slidingProgress = 0;
PeriodicCallSet(true);
MarkToReedraw();
MarkToRedraw();
}
/**
@ -223,7 +223,7 @@ void ewol::WSlider::PeriodicCall(int64_t localTime)
m_slidingProgress = etk_avg(0, m_slidingProgress, 1000);
}
CalculateSize(m_size.x, m_size.y);
MarkToReedraw();
MarkToRedraw();
}

View File

@ -118,7 +118,7 @@ bool ewol::WidgetScrooled::OnEventInput(ewol::inputType_te type, int32_t IdInput
// force direct scrolling in this case
m_originScrooled.y = (int32_t)(m_maxSize.y * (relativePos.y-SCROLL_BAR_SPACE) / (m_size.y-SCROLL_BAR_SPACE*2));
m_originScrooled.y = etk_avg(0, m_originScrooled.y, (m_maxSize.y - m_size.y*m_limitScrolling));
MarkToReedraw();
MarkToRedraw();
return true;
}
} else if (relativePos.y >= (m_size.y-SCROLL_BAR_SPACE)) {
@ -131,7 +131,7 @@ bool ewol::WidgetScrooled::OnEventInput(ewol::inputType_te type, int32_t IdInput
// force direct scrolling in this case
m_originScrooled.x = (int32_t)(m_maxSize.x * (relativePos.x-SCROLL_BAR_SPACE) / (m_size.x-SCROLL_BAR_SPACE*2));
m_originScrooled.x = etk_avg(0, m_originScrooled.x, (m_maxSize.x - m_size.x*m_limitScrolling));
MarkToReedraw();
MarkToRedraw();
return true;
}
}
@ -140,14 +140,14 @@ bool ewol::WidgetScrooled::OnEventInput(ewol::inputType_te type, int32_t IdInput
if(m_size.y < m_maxSize.y) {
m_originScrooled.y -= m_pixelScrolling;
m_originScrooled.y = etk_avg(0, m_originScrooled.y, (m_maxSize.y - m_size.y*m_limitScrolling));
MarkToReedraw();
MarkToRedraw();
return true;
}
} else if (5 == IdInput && ewol::EVENT_INPUT_TYPE_UP == typeEvent) {
if(m_size.y < m_maxSize.y) {
m_originScrooled.y += m_pixelScrolling;
m_originScrooled.y = etk_avg(0, m_originScrooled.y, (m_maxSize.y - m_size.y*m_limitScrolling));
MarkToReedraw();
MarkToRedraw();
return true;
}
}else if (2 == IdInput) {
@ -162,7 +162,7 @@ bool ewol::WidgetScrooled::OnEventInput(ewol::inputType_te type, int32_t IdInput
} else if (ewol::SCROLL_DISABLE!=m_highSpeedMode && ewol::EVENT_INPUT_TYPE_LEAVE == typeEvent) {
m_highSpeedMode = ewol::SCROLL_DISABLE;
m_highSpeedType = ewol::INPUT_TYPE_UNKNOW;
MarkToReedraw();
MarkToRedraw();
return true;
}
if (IdInput==m_highSpeedButton && ewol::SCROLL_DISABLE!=m_highSpeedMode) {
@ -174,7 +174,7 @@ bool ewol::WidgetScrooled::OnEventInput(ewol::inputType_te type, int32_t IdInput
return false;
} else {
m_highSpeedMode = ewol::SCROLL_GREP_END_EVENT;
MarkToReedraw();
MarkToRedraw();
return true;
}
} else if (ewol::SCROLL_GREP_END_EVENT == m_highSpeedMode) {
@ -182,7 +182,7 @@ bool ewol::WidgetScrooled::OnEventInput(ewol::inputType_te type, int32_t IdInput
m_highSpeedMode = ewol::SCROLL_DISABLE;
m_highSpeedType = ewol::INPUT_TYPE_UNKNOW;
m_highSpeedButton = -1;
MarkToReedraw();
MarkToRedraw();
}
return true;
} else if (ewol::SCROLL_INIT==m_highSpeedMode && ewol::EVENT_INPUT_TYPE_MOVE == typeEvent) {
@ -208,19 +208,19 @@ bool ewol::WidgetScrooled::OnEventInput(ewol::inputType_te type, int32_t IdInput
} else {
m_highSpeedStartPos.y = m_originScrooled.y / m_maxSize.y * (m_size.y-SCROLL_BAR_SPACE*2);
}
MarkToReedraw();
MarkToRedraw();
}
m_originScrooled.y = etk_avg(0, m_originScrooled.y, (m_maxSize.y - m_size.y*m_limitScrolling));
return true;
} if (ewol::SCROLL_ENABLE_HORIZONTAL==m_highSpeedMode && ewol::EVENT_INPUT_TYPE_MOVE == typeEvent) {
m_originScrooled.x = (int32_t)(m_maxSize.x * (relativePos.x-SCROLL_BAR_SPACE) / (m_size.x-SCROLL_BAR_SPACE*2));
m_originScrooled.x = etk_avg(0, m_originScrooled.x, (m_maxSize.x - m_size.x*m_limitScrolling));
MarkToReedraw();
MarkToRedraw();
return true;
} if (ewol::SCROLL_ENABLE_VERTICAL==m_highSpeedMode && ewol::EVENT_INPUT_TYPE_MOVE == typeEvent) {
m_originScrooled.y = (int32_t)(m_maxSize.y * (relativePos.y-SCROLL_BAR_SPACE) / (m_size.y-SCROLL_BAR_SPACE*2));
m_originScrooled.y = etk_avg(0, m_originScrooled.y, (m_maxSize.y - m_size.y*m_limitScrolling));
MarkToReedraw();
MarkToRedraw();
return true;
}
}
@ -238,7 +238,7 @@ bool ewol::WidgetScrooled::OnEventInput(ewol::inputType_te type, int32_t IdInput
m_highSpeedMode = ewol::SCROLL_DISABLE;
m_highSpeedType = ewol::INPUT_TYPE_UNKNOW;
EWOL_VERBOSE("SCROOL ==> DISABLE");
MarkToReedraw();
MarkToRedraw();
return true;
} else if (ewol::SCROLL_INIT==m_highSpeedMode && ewol::EVENT_INPUT_TYPE_MOVE == typeEvent) {
// wait that the cursor move more than 10 px to enable it :
@ -248,7 +248,7 @@ bool ewol::WidgetScrooled::OnEventInput(ewol::inputType_te type, int32_t IdInput
// select the direction :
m_highSpeedMode = ewol::SCROLL_ENABLE_FINGER;
EWOL_VERBOSE("SCROOL ==> ENABLE");
MarkToReedraw();
MarkToRedraw();
}
return true;
} if (ewol::SCROLL_ENABLE_FINGER==m_highSpeedMode && ewol::EVENT_INPUT_TYPE_MOVE == typeEvent) {
@ -260,14 +260,14 @@ bool ewol::WidgetScrooled::OnEventInput(ewol::inputType_te type, int32_t IdInput
m_highSpeedStartPos.x = relativePos.x;
m_highSpeedStartPos.y = relativePos.y;
EWOL_VERBOSE("SCROOL ==> MOVE (" << m_originScrooled.x << "," << m_originScrooled.y << ")");
MarkToReedraw();
MarkToRedraw();
return true;
}
} else if (ewol::SCROLL_DISABLE!=m_highSpeedMode && ewol::EVENT_INPUT_TYPE_LEAVE == typeEvent) {
m_highSpeedMode = ewol::SCROLL_DISABLE;
m_highSpeedType = ewol::INPUT_TYPE_UNKNOW;
EWOL_VERBOSE("SCROOL ==> DISABLE");
MarkToReedraw();
MarkToRedraw();
return true;
}
}
@ -284,7 +284,7 @@ bool ewol::WidgetScrooled::OnEventInput(ewol::inputType_te type, int32_t IdInput
} else {
m_zoom = etk_max(1.0, m_zoom);
}
MarkToReedraw();
MarkToRedraw();
return true;
} else if (5 == IdInput && ewol::EVENT_INPUT_TYPE_UP == typeEvent) {
m_zoom += 0.1;
@ -293,7 +293,7 @@ bool ewol::WidgetScrooled::OnEventInput(ewol::inputType_te type, int32_t IdInput
} else {
m_zoom = etk_min(1.0, m_zoom);
}
MarkToReedraw();
MarkToRedraw();
return true;
}
}

View File

@ -416,7 +416,7 @@ void ewol::FileChooser::UpdateCurrentFolder(void)
if (NULL != m_widgetCurrentFolder) {
m_widgetCurrentFolder->SetValue(m_folder);
}
MarkToReedraw();
MarkToRedraw();
}

View File

@ -164,7 +164,7 @@ ewol::Parameter::Parameter(void) :
mySizerVert->SubWidgetAdd(m_widgetTitle);
}
}
MarkToReedraw();
MarkToRedraw();
}

View File

@ -232,7 +232,7 @@ bool ewol::ParameterList::OnEventInput(ewol::inputType_te type, int32_t IdInput,
if (m_list[rawID]->m_refId>=0) {
GenerateEventId(ewolEventParameterListSelect, m_list[rawID]->m_refId);
m_idSelected = rawID;
MarkToReedraw();
MarkToRedraw();
return true;
}
}
@ -261,7 +261,7 @@ void ewol::ParameterList::MenuAdd(etk::UString& label, int32_t refId, etk::UStri
if (m_idSelected == -1 && label != "---" && refId>0) {
m_idSelected = m_list.Size()-1;
}
MarkToReedraw();
MarkToRedraw();
}
}
void ewol::ParameterList::MenuAddGroup(etk::UString& label)
@ -270,7 +270,7 @@ void ewol::ParameterList::MenuAddGroup(etk::UString& label)
ewol::elementPL* tmpEmement = new ewol::elementPL(label, -1, image, true);
if (NULL != tmpEmement) {
m_list.PushBack(tmpEmement);
MarkToReedraw();
MarkToRedraw();
}
}