Commit 7ea9e804 by Lee Jaebin

プロジェクトPDFのみ、作業追加、更新ができるように修正

parent 479d019d
...@@ -1819,7 +1819,18 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -1819,7 +1819,18 @@ public class ContentViewActivity extends ABVContentViewActivity {
} }
Logger.d(TAG, "[singleTapMotion]:isOnClick=false"); Logger.d(TAG, "[singleTapMotion]:isOnClick=false");
if (!mPageScrollView.isZooming()) { if (mPageScrollView.isZooming()) {
if (!isProjectPdf) {
ZoomRelativeLayout zoomRelativeLayout = mShowPageLayout.get(mCurrentPageNumber);
if (zoomRelativeLayout == null) {
Logger.e(TAG, "zoomRelativeLayout is null");
return;
}
// 拡大中は拡大率を表示
int scale = (int) (mShowPageLayout.get(mCurrentPageNumber).getScaleFactor() * 100f);
Toast.makeText(getApplicationContext(), String.format("%d%%", scale), Toast.LENGTH_SHORT).show();
}
} else {
TranslateAnimation toolBarAnimation; TranslateAnimation toolBarAnimation;
if (mToolBar.getVisibility() == View.GONE) { if (mToolBar.getVisibility() == View.GONE) {
setToolbarVisable(true); setToolbarVisable(true);
......
...@@ -184,7 +184,9 @@ public class ZoomRelativeLayout extends RelativeLayout { ...@@ -184,7 +184,9 @@ public class ZoomRelativeLayout extends RelativeLayout {
@Override @Override
protected void dispatchDraw(Canvas canvas) { protected void dispatchDraw(Canvas canvas) {
canvas.save(Canvas.MATRIX_SAVE_FLAG); canvas.save(Canvas.MATRIX_SAVE_FLAG);
// canvas.concat(imgMatrix); if (!isProjectPdf) {
canvas.concat(imgMatrix);
}
super.dispatchDraw(canvas); super.dispatchDraw(canvas);
canvas.restore(); canvas.restore();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment