diff --git a/src/gui/core/assets.cc b/src/gui/core/assets.cc index 1ccf772f..d3da2195 100755 --- a/src/gui/core/assets.cc +++ b/src/gui/core/assets.cc @@ -300,13 +300,13 @@ void Assets::loadStrings(const std::string&lan) { const std::string suffix = "/strings-"+lan+".xml"; for(auto a:mResources) { std::vectorfiles; - a.second->getEntries(files); - for(auto fileName:files){ + a.second->getEntries(files); + for(auto fileName:files){ if( (TextUtils::endWith(fileName,".xml") && TextUtils::endWith(fileName,suffix) )==false)continue; loadKeyValues(fileName,nullptr,std::bind(&Assets::parseItem,this,a.first,fileName,std::placeholders::_1, std::placeholders::_2,std::placeholders::_3,std::placeholders::_4)); LOGD("load %s for '%s'",fileName.c_str(),lan.c_str()); - } + } } } diff --git a/src/gui/view/motionevent.cc b/src/gui/view/motionevent.cc index f94cc0dc..72750dcd 100644 --- a/src/gui/view/motionevent.cc +++ b/src/gui/view/motionevent.cc @@ -604,7 +604,35 @@ float MotionEvent::getHistoricalX(size_t pointerIndex, size_t historicalIndex) c } float MotionEvent::getHistoricalY(size_t pointerIndex, size_t historicalIndex) const{ - return getHistoricalRawAxisValue(AXIS_Y, pointerIndex, historicalIndex); + return getHistoricalRawAxisValue(AXIS_Y, pointerIndex, historicalIndex); +} + +float MotionEvent::getHistoricalPressure(size_t pointerIndex, size_t historicalIndex) const{ + return getHistoricalRawAxisValue(AXIS_PRESSURE, pointerIndex, historicalIndex); +} + +float MotionEvent::getHistoricalSize(size_t pointerIndex, size_t historicalIndex) const{ + return getHistoricalRawAxisValue(AXIS_SIZE, pointerIndex, historicalIndex); +} + +float MotionEvent::getHistoricalTouchMajor(size_t pointerIndex, size_t historicalIndex) const{ + return getHistoricalRawAxisValue(AXIS_TOUCH_MAJOR, pointerIndex, historicalIndex); +} + +float MotionEvent::getHistoricalTouchMinor(size_t pointerIndex, size_t historicalIndex) const{ + return getHistoricalRawAxisValue(AXIS_TOUCH_MINOR, pointerIndex, historicalIndex); +} + +float MotionEvent::getHistoricalToolMajor(size_t pointerIndex, size_t historicalIndex) const{ + return getHistoricalRawAxisValue(AXIS_TOOL_MAJOR, pointerIndex, historicalIndex); +} + +float MotionEvent::getHistoricalToolMinor(size_t pointerIndex, size_t historicalIndex) const{ + return getHistoricalRawAxisValue(AXIS_TOOL_MINOR, pointerIndex, historicalIndex); +} + +float MotionEvent::getHistoricalOrientation(size_t pointerIndex, size_t historicalIndex) const{ + return getHistoricalRawAxisValue(AXIS_ORIENTATION, pointerIndex, historicalIndex); } template @@ -612,6 +640,7 @@ static void appendUnless(T defValue, std::ostringstream& os,const std::string& k if (/*DEBUG_CONCISE_TOSTRING &&*/ defValue==value) return; os<