diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/PanelController.java | 19 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java | 15 |
2 files changed, 22 insertions, 12 deletions
diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java index 9f5f2656a..9448b5638 100644 --- a/src/com/android/gallery3d/filtershow/PanelController.java +++ b/src/com/android/gallery3d/filtershow/PanelController.java @@ -161,19 +161,24 @@ public class PanelController implements OnClickListener { imageCrop.apply(1, 1); break; } - case R.id.crop_menu_4to6: { - button.setText(mContext.getString(R.string.aspect4to6_effect)); - imageCrop.apply(6, 4); + case R.id.crop_menu_4to3: { + button.setText(mContext.getString(R.string.aspect4to3_effect)); + imageCrop.apply(4, 3); + break; + } + case R.id.crop_menu_3to4: { + button.setText(mContext.getString(R.string.aspect3to4_effect)); + imageCrop.apply(3, 4); break; } case R.id.crop_menu_5to7: { button.setText(mContext.getString(R.string.aspect5to7_effect)); - imageCrop.apply(7, 5); + imageCrop.apply(5, 7); break; } - case R.id.crop_menu_9to16: { - button.setText(mContext.getString(R.string.aspect9to16_effect)); - imageCrop.apply(16, 9); + case R.id.crop_menu_7to5: { + button.setText(mContext.getString(R.string.aspect7to5_effect)); + imageCrop.apply(7, 5); break; } case R.id.crop_menu_none: { diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java index cfeceb059..863191a7a 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java @@ -430,6 +430,16 @@ public class ImageCrop extends ImageGeometry { float deltaY = dY / scale; int select = movingEdges; if (mFixAspectRatio && (select != MOVE_BLOCK)) { + + // TODO: add in orientation change for fixed aspect + /*if (select == TOP_LEFT || select == TOP_RIGHT || + select == BOTTOM_LEFT || select == BOTTOM_RIGHT){ + RectF blank = new RectF(); + if(switchCropBounds(select, blank)){ + setCropBounds(blank); + return; + } + }*/ if (select == MOVE_LEFT) { select |= MOVE_TOP; } @@ -442,11 +452,6 @@ public class ImageCrop extends ImageGeometry { if (select == MOVE_BOTTOM) { select |= MOVE_RIGHT; } - RectF blank = new RectF(); - if(switchCropBounds(select, blank)){ - setCropBounds(blank); - return; - } } if (select == MOVE_BLOCK) { |