Skip to content

修复element宽高不一致时，可能被裁剪问题 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emile2013 wants to merge 6 commits into
base: master
Choose a base branch
from
Open

修复element宽高不一致时，可能被裁剪问题 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c6bc887
修复element宽高不一致时，可能被裁剪问题
Jan 3, 2020
a06b8be
单指操作不在子控件，进行事件分发,不作全局拦截
Jan 7, 2020
2476afb
Revert "单指操作不在子控件，进行事件分发,不作全局拦截"
Jan 7, 2020
43300ff
单指操作不在子控件，进行事件分发,不作全局拦截
Jan 7, 2020
8dacfd8
修改事件拦截机制
Jan 17, 2020
4b6409a
fix
Jan 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions sticker/src/main/java/com/whensunset/sticker/ElementContainerView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,16 @@ public void onEnd(MultiTouchGestureDetector detector) {

@Override
public boolean dispatchTouchEvent(MotionEvent ev) {

//空白区域，没有选中元素，放行
if (ev.getAction() == MotionEvent.ACTION_DOWN) {
final float x = ev.getX(), y = ev.getY();
WsElement clickedElement = findElementByPosition(x, y);
if (clickedElement == null && mSelectedElement == null) {
return false;
}
}

if (mSelectedElement != null && mSelectedElement.isShowingViewResponseSelectedClick()) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) {
mUpDownMotionEvent[0] = copyMotionEvent(ev);
Expand Down Expand Up @@ -178,6 +188,12 @@ public boolean onTouchEvent(@NonNull MotionEvent event) {
case MotionEvent.ACTION_DOWN:
cancelAutoUnSelectDecoration();
singleFingerDown(event);
//单指操作不在子控件，进行事件分发,不作全局拦截
if (mMode == BaseActionMode.SINGLE_TAP_BLANK_SCREEN) {
autoUnSelectDecoration();
singleFingerUp(event);
return false;
}
break;
case MotionEvent.ACTION_MOVE:
mDetector.onTouchEvent(event);
Expand Down
2 changes: 1 addition & 1 deletion sticker/src/main/java/com/whensunset/sticker/WsElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public void add(ElementContainerView elementContainerView) {

if (mElementShowingView == null) {
mElementShowingView = initView();
AbsoluteLayout.LayoutParams showingViewLayoutParams = new AbsoluteLayout.LayoutParams((int) mOriginWidth, (int) mOriginWidth, 0, 0);
AbsoluteLayout.LayoutParams showingViewLayoutParams = new AbsoluteLayout.LayoutParams((int) mOriginWidth, (int) mOriginHeight, 0, 0);
mElementShowingView.setLayoutParams(showingViewLayoutParams);
mElementContainerView.addView(mElementShowingView);
} else {
Expand Down