'resizing rect' resizes after widget resizing ;)

CyanogenMod · Oct 4, 2010 · 4924e01 · 4924e01
1 parent 11ff054
commit 4924e01
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/src/com/android/launcher/Launcher.java b/src/com/android/launcher/Launcher.java
@@ -4186,6 +4186,19 @@ protected void editWidget(final View widget){
                 RectF widgetRect = new RectF(x,y, x + width, y + height);
                 ((ResizeViewHandler)mScreensEditor).setup(null, screenRect, widgetRect, false,false,minw-10,minh-10);
                 mDragLayer.addView(mScreensEditor);
+                ((ResizeViewHandler)mScreensEditor).setOnValidateSizingRect(new ResizeViewHandler.OnSizeChangedListener() {
+
+					@Override
+					public void onTrigger(RectF r) {
+						final float left = Math.round(r.left/minw) * minw;
+						final float top = Math.round(r.top/minh) * minh;
+						final float right = left + (Math.max(Math.round(r.width()/(minw)),1) * minw);
+						final float bottom = top + (Math.max(Math.round(r.height()/(minh)),1) * minh);
+
+						r.set(left, top, right, bottom);
+					}
+				});
+
                 ((ResizeViewHandler)mScreensEditor).setOnSizeChangedListener(new ResizeViewHandler.OnSizeChangedListener() {
                     @Override
                     public void onTrigger(RectF r) {

diff --git a/src/com/android/launcher/ResizeViewHandler.java b/src/com/android/launcher/ResizeViewHandler.java
@@ -423,6 +423,7 @@ enum ModifyMode { None, Move, Grow }
     private float mMinWidth=25F;
     private float mMinHeight=25F;
     private OnSizeChangedListener mOnTriggerListener=null;
+    private OnSizeChangedListener mOnValidateSizingListener=null;
     @Override
     public boolean onTouchEvent(MotionEvent event) {
         switch (event.getAction()) {
@@ -441,6 +442,7 @@ public boolean onTouchEvent(MotionEvent event) {
                 break;
             case MotionEvent.ACTION_UP:
                 setMode(ModifyMode.None);
+                dispatchValidateSizingRect();
                 break;
             case MotionEvent.ACTION_MOVE:
                 handleMotion(mMotionEdge,
@@ -452,6 +454,18 @@ public boolean onTouchEvent(MotionEvent event) {
         }
         return true;
     }
+
+    public void setOnValidateSizingRect(OnSizeChangedListener listener) {
+    	mOnValidateSizingListener = listener;
+    }
+
+    private void dispatchValidateSizingRect() {
+    	if (mOnValidateSizingListener != null) {
+    		mOnValidateSizingListener.onTrigger(mCropRect);
+    		invalidate();
+    	}
+    }
+
     public void setOnSizeChangedListener(OnSizeChangedListener listener) {
         mOnTriggerListener = listener;
     }