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

remove last touch specific code ==> compile on PC too

Browse Source
This commit is contained in:
Edouard Dupin 2012-05-22 09:54:01 +02:00
parent 2f34ae3f87
commit 0f56843aa6
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/libewol/Android.mk
View File

@ -12,7 +12,6 @@ LOCAL_EXPORT_LDLIBS := -lGLESv1_CM -ldl -llog -lz
ifeq ($(DEBUG),1) ifeq ($(DEBUG),1)
LOCAL_CFLAGS := -D__PLATFORM__Android \ LOCAL_CFLAGS := -D__PLATFORM__Android \
-D__MODE__Touch \
-Wno-write-strings \ -Wno-write-strings \
-DETK_DEBUG_LEVEL=3 \ -DETK_DEBUG_LEVEL=3 \
-DEWOL_DEBUG_LEVEL=3 \ -DEWOL_DEBUG_LEVEL=3 \
@ -22,7 +21,6 @@ LOCAL_CFLAGS := -D__PLATFORM__Android \
-frtti -frtti
else else
LOCAL_CFLAGS := -D__PLATFORM__Android \ LOCAL_CFLAGS := -D__PLATFORM__Android \
-D__MODE__Touch \
-Wno-write-strings \ -Wno-write-strings \
-DETK_DEBUG_LEVEL=1 \ -DETK_DEBUG_LEVEL=1 \
-DEWOL_DEBUG_LEVEL=1 \ -DEWOL_DEBUG_LEVEL=1 \

21
Sources/libewol/ewol/widget/WidgetScrolled.cpp
View File

@ -89,26 +89,6 @@ const char * const ewol::WidgetScrooled::GetObjectType(void)
void ewol::WidgetScrooled::OnRegenerateDisplay(void) void ewol::WidgetScrooled::OnRegenerateDisplay(void)
{ {
#ifdef __MODE__Touch
/*
if(ewol::SCROLL_ENABLE==m_highSpeedMode) {
ewol::OObject2DColored* myOObjectsColored = new ewol::OObject2DColored();
myOObjectsColored->SetColor(1.0, 0.0, 0.0, 0.4);
myOObjectsColored->Disc(m_highSpeedStartPos.x, m_highSpeedStartPos.y, 10);
AddOObject(myOObjectsColored);
}
*/
#else
/*
if( ewol::SCROLL_ENABLE_HORIZONTAL==m_highSpeedMode
|| ewol::SCROLL_ENABLE_VERTICAL ==m_highSpeedMode) {
ewol::OObject2DColored* myOObjectsColored = new ewol::OObject2DColored();
myOObjectsColored->SetColor(1.0, 0.0, 0.0, 0.4);
myOObjectsColored->Disc(m_highSpeedStartPos.x, m_highSpeedStartPos.y, 10);
AddOObject(myOObjectsColored);
}
*/
#endif
ClearOObjectList(); ClearOObjectList();
ewol::OObject2DColored* myOObjectsColored = NULL; ewol::OObject2DColored* myOObjectsColored = NULL;
if(m_size.y < m_maxSize.y || m_size.x < m_maxSize.x) { if(m_size.y < m_maxSize.y || m_size.x < m_maxSize.x) {
@ -443,3 +423,4 @@ void ewol::WidgetScrooled::SetScrollingPositionDynamic(coord2D_ts borderWidth, c
} }
} }