add MotioNEvent::getClassification

apps/samples/pagetransformers.h

@@ -7,87 +7,196 @@ namespace cdroid{
 class ABaseTransformer:public ViewPager::PageTransformer{
 protected:
     virtual void onTransform(View&page,float position)=0;
-    virtual bool hideOffscreenPages();
-    virtual bool isPagingEnabled();
-    virtual void onPreTransform(View&page,float position);
-    virtual void onPostTransform(View&page,float position);
+    virtual bool hideOffscreenPages(){return false;}
+    virtual bool isPagingEnabled(){return false;}
+    virtual void onPreTransform(View&page,float position){
+        const float width = page.getWidth();
+        page.setRotationX(0);
+        page.setRotationY(0);
+        page.setRotation(0);
+        page.setScaleX(1);
+        page.setScaleY(1);
+        page.setPivotX(0);
+        page.setPivotY(0);
+        page.setTranslationY(0);
+        page.setTranslationX(isPagingEnabled() ? .0f : -width * position);
+
+        if (hideOffscreenPages()) {
+            page.setAlpha(position <= -1.f || position >= 1.f ? .0f : 1.f);
+            //page.setEnabled(false);
+        } else {
+            //page.setEnabled(true);
+            page.setAlpha(1.f);
+        }
+    }
+    virtual void onPostTransform(View&page,float position){
+        //NOTHING
+    }
 public:
-    void transformPage(View&page,float position)override;
+    void transformPage(View&page,float position)override{
+        onPreTransform(page, position);
+        onTransform(page, position);
+        onPostTransform(page, position);
+    }
 };
 
 
 class AccordionTransformer:public ABaseTransformer {
 protected:
-    void onTransform(View& view, float position)override;
+    void onTransform(View& view, float position)override{
+        view.setPivotX(position < 0 ? 0 : view.getWidth());
+        view.setScaleX(position < 0 ? 1.f + position : 1.f - position);
+    }
 };
 
 class CubeInTransformer:public ABaseTransformer{
 protected:
-    void onTransform(View& view, float position)override;
-    bool isPagingEnabled()override;
+    void onTransform(View& view, float position)override{
+        LOGD("cubein %d,%d",view.getWidth(),view.getHeight());
+        // Rotate the fragment on the left or right edge
+        view.setPivotX(position > 0 ? 0 : view.getWidth());
+        view.setPivotY(0);
+        view.setRotationY(-90.f * position);
+    }
+    bool isPagingEnabled()override{return true;}
 };
 
 class CubeOutTransformer:public ABaseTransformer{
 protected:
-    void onTransform(View& view, float position)override;
-    bool isPagingEnabled()override;
+    void onTransform(View& view, float position)override{
+        view.setPivotX(position < .0f ? view.getWidth() : .0f);
+        view.setPivotY(view.getHeight() * 0.5f);
+        view.setRotationY(90.f * position);
+    }
+    bool isPagingEnabled()override{return true;}
 };
 
 class DefaultTransformer:ABaseTransformer{
 protected:
-    void onTransform(View& view, float position)override;
-    bool isPagingEnabled()override;
+    void onTransform(View& view, float position)override{/*NOTHING*/};
+    bool isPagingEnabled()override{return true;}
 };
 
 class FlipHorizontalTransformer:public ABaseTransformer{
 protected:
-    void onTransform(View& view, float position)override;
-    void onPostTransform(View&page,float position)override;   
+    void onTransform(View& view, float position)override{
+        const float rotation = 180.f * position;
+        view.setAlpha(rotation > 90.f || rotation < -90.f ? 0 : 1);
+        view.setPivotX(view.getWidth() * 0.5f);
+        view.setPivotY(view.getHeight() * 0.5f);
+        view.setRotationY(rotation);
+    }
+    void onPostTransform(View&page,float position)override{
+        ABaseTransformer::onPostTransform(page, position);
+        //resolve problem: new page can't handle click event!
+        page.setVisibility((position > -0.5f && position < 0.5f)?View::VISIBLE:View::INVISIBLE);
+    }
 };
 
 class FlipVerticalTransformer:public ABaseTransformer{
 protected:
-    void onTransform(View& view, float position)override;
-    void onPostTransform(View&page,float position)override;
+    void onTransform(View& view, float position)override{
+        const float rotation = -180.f * position;
+
+        view.setAlpha(rotation > 90.f || rotation < -90.f ? .0f : 1.f);
+        view.setPivotX(view.getWidth() * 0.5f);
+        view.setPivotY(view.getHeight() * 0.5f);
+        view.setRotationX(rotation);
+    }
+    void onPostTransform(View&page,float position)override{
+        ABaseTransformer::onPostTransform(page, position);
+        page.setVisibility((position > -0.5f && position < 0.5f)?View::VISIBLE:View::INVISIBLE);
+    }
 };
 
 class ParallaxTransformer:public ViewPager::PageTransformer{
 public:
-   void transformPage(View& page, float position)override;
+   void transformPage(View& page, float position)override{
+       const int width = page.getWidth();
+       if (position < -1) {
+           page.setScrollX((int) (width * 0.75 * -1));
+       } else if (position <= 1) {
+           if (position < 0) {
+               page.setScrollX((int) (width * 0.75 * position));
+           } else {
+               page.setScrollX((int) (width * 0.75 * position));
+           }
+       } else {
+           page.setScrollX((int) (width * 0.75));
+       }
+   }
 };
 
 class RotateDownTransformer:public ABaseTransformer{
 private:static constexpr  float ROT_MOD = -15.f;
 protected:
-    void onTransform(View& view, float position)override;
-    bool isPagingEnabled()override;
+    void onTransform(View& view, float position)override{
+        const float width = view.getWidth();
+        const float height = view.getHeight();
+        const float rotation = ROT_MOD * position * -1.25f;
+
+        view.setPivotX(width * 0.5f);
+        view.setPivotY(height);
+        view.setRotation(rotation);
+    }
+    bool isPagingEnabled()override{return true;}
 };
 
 class RotateUpTransformer:public ABaseTransformer{
 private:static constexpr  float ROT_MOD = -15.f;
 protected:
-    void onTransform(View& view, float position)override;
-    bool isPagingEnabled()override;
+    void onTransform(View& view, float position)override{
+        const float width = view.getWidth();
+        const float rotation = ROT_MOD * position;
+
+        view.setPivotX(width * 0.5f);
+        view.setPivotY(.0f);
+        view.setTranslationX(.0f);
+        view.setRotation(rotation);
+    }
+    bool isPagingEnabled()override{return true;}
 };
 
 class ScaleInOutTransformer:public ABaseTransformer{
 protected:
-    void onTransform(View& view, float position)override;
+    void onTransform(View& view, float position)override{
+        view.setPivotX(position < 0 ? 0 : view.getWidth());
+        view.setPivotY(view.getHeight() / 2.f);
+        float scale = position < 0 ? 1.f + position : 1.f - position;
+        view.setScaleX(scale);
+        view.setScaleY(scale);
+    }
 };
 
 class StackTransformer:public ABaseTransformer{
 protected:
-    void onTransform(View& view, float position)override;
+    void onTransform(View& view, float position)override{
+        view.setTranslationX(position < 0 ? .0f : -view.getWidth() * position);
+    }
 };
 
 class ZoomInTransformer:public ABaseTransformer{
 protected:
-    void onTransform(View& view, float position)override;
+    void onTransform(View& view, float position)override{
+        const float scale = position < 0 ? position + 1.f : std::abs(1.f - position);
+        view.setScaleX(scale);
+        view.setScaleY(scale);
+        view.setPivotX(view.getWidth() * 0.5f);
+        view.setPivotY(view.getHeight()* 0.5f);
+        view.setAlpha(position < -1.f || position > 1.f ? .0f : 1.f - (scale - 1.f));
+    }
 };
 
 class ZoomOutTransformer:public ABaseTransformer{
 protected:
-    void onTransform(View& view, float position)override;
+    void onTransform(View& view, float position)override{
+        const float scale = position < 0 ? position + 1.f : std::abs(1.f - position);
+        view.setScaleX(scale);
+        view.setScaleY(scale);
+        view.setPivotX(view.getWidth() * 0.5f);
+        view.setPivotY(view.getHeight() * 0.5f);
+        view.setAlpha(position < -1.f || position > 1.f ? .0f : 1.f - (scale - 1.f));
+    }
 };
 
 class ZoomOutSlideTransformer:public ABaseTransformer{
@@ -95,10 +204,37 @@ private:
     float mMinScale;
     float mMinAlpha;
 protected:
-    void onTransform(View& view, float position);
+    void onTransform(View& view, float position){
+        if ((position >= -1.f) && (position <= 1.f)) {
+            // Modify the default slide transition to shrink the page as well
+            const float height = view.getHeight();
+            const float width = view.getWidth();
+            const float scaleFactor = std::max(mMinScale, 1.f - std::abs(position));
+            const float vertMargin = height * (1.f - scaleFactor) / 2.f;
+            const float horzMargin = width * (1.f - scaleFactor) / 2.f;
+
+            // Center vertically
+            view.setPivotY(0.5f * height);
+            view.setPivotX(0.5f * width);
+
+            if (position < 0) {
+                view.setTranslationX(horzMargin - vertMargin / 2.f);
+            } else {
+                view.setTranslationX(-horzMargin+ vertMargin / 2.f);
+            }
+
+            // Scale the page down (between MIN_SCALE and 1)
+            view.setScaleX(scaleFactor);
+            view.setScaleY(scaleFactor);
+
+            // Fade the page relative to its size.
+            view.setAlpha(mMinAlpha + (scaleFactor - mMinScale) / (1.f - mMinScale) * (1.f - mMinAlpha));
+        }
+
+    }
 public:
-    ZoomOutSlideTransformer();
-    ZoomOutSlideTransformer(float minscale,float minalpha);
+    ZoomOutSlideTransformer():ZoomOutSlideTransformer(.85f,.5f){};
+    ZoomOutSlideTransformer(float minscale,float minalpha):mMinScale(minscale),mMinAlpha(minalpha){}
 };
 
 }//endof namespace

apps/uidemo2/devicepanel.cc

@@ -90,7 +90,7 @@ void DevicePanel::onClick(View&v){
          mDevices.insert(std::pair<int,PagerAdapter*>(id,adapter));
     }
     mLastDevice = id;
-    if(adapter->getCount()==0){
+    if(adapter&&adapter->getCount()==0){
         adapter->add(Device("设备1",true,true));
         adapter->add(Device("设备2",true,false));
         adapter->add(Device("设备3",false,true));

src/gui/view/motionevent.cc

@@ -203,6 +203,7 @@ void MotionEvent::initialize(
     mEdgeFlags = edgeFlags;
     mMetaState = metaState;
     mButtonState = buttonState;
+    mClassification=0;
     mXOffset = xOffset;
     mYOffset = yOffset;
     mXPrecision = xPrecision;
@@ -233,6 +234,7 @@ void MotionEvent::copyFrom(const MotionEvent* other, bool keepHistory) {
     mEdgeFlags = other->mEdgeFlags;
     mMetaState = other->mMetaState;
     mButtonState = other->mButtonState;
+    mClassification=other->mClassification;
     mXOffset = other->mXOffset;
     mYOffset = other->mYOffset;
     mXPrecision = other->mXPrecision;

src/gui/view/motionevent.h

@@ -178,6 +178,7 @@ protected:
     int32_t mEdgeFlags;
     int32_t mMetaState;
     int32_t mButtonState;
+    int32_t mClassification;
     float mXOffset;
     float mYOffset;
     float mXPrecision;
@@ -243,6 +244,7 @@ public:
     inline int32_t getButtonState() const { return mButtonState; }
     inline void setButtonState(int32_t buttonState) { mButtonState = buttonState; }
     bool isButtonPressed(int button)const;
+    int32_t  getClassification()const{return mClassification;}
     inline int32_t getActionButton() const { return mActionButton; }
     inline void setActionButton(int32_t button) { mActionButton = button; }
     inline float getXOffset() const { return mXOffset; }

tests/gui/image_unittests.cc

@@ -10,7 +10,6 @@
 #include <dirent.h>
 //#include <svg-cairo.h>
 #include <fstream>
-#include <gui/gui_features.h>
 #ifdef ENABLE_CAIROSVG
 #include <curl/curl.h>
 #endif