Skip to content

Prevent margin clicks from going to the parent node #151

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Prevent margin clicks from going to the parent node #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68a5d1c
Prevent margin click from affecting parent node
cimugbit Apr 26, 2018
ac5b9a7
Corrected typo in method name
cimugbit Apr 26, 2018
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
15 changes: 12 additions & 3 deletions library/src/main/java/com/unnamed/b/atv/model/TreeNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ public interface TreeNodeLongClickListener {
public static abstract class BaseNodeViewHolder<E> {
protected AndroidTreeView tView;
protected TreeNode mNode;
private View nodeView;
private View mView;
protected int containerStyle;
protected Context context;
Expand All @@ -234,16 +235,24 @@ public View getView() {
if (mView != null) {
return mView;
}
final View nodeView = getNodeView();
nodeView = getNodeView();
final TreeNodeWrapperView nodeWrapperView = new TreeNodeWrapperView(nodeView.getContext(), getContainerStyle());
nodeWrapperView.insertNodeView(nodeView);
mView = nodeWrapperView;

return mView;
}

public void setTreeViev(AndroidTreeView treeViev) {
this.tView = treeViev;
public void setOnClickListener(View.OnClickListener listener) {
nodeView.setOnClickListener(listener);
}

public void setOnLongClickListener(View.OnLongClickListener listener) {
nodeView.setOnLongClickListener(listener);
}

public void setTreeView(AndroidTreeView treeView) {
this.tView = treeView;
}

public AndroidTreeView getTreeView() {
Expand Down
6 changes: 3 additions & 3 deletions library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ private void addNode(ViewGroup container, final TreeNode n) {
viewHolder.toggleSelectionMode(mSelectionModeEnabled);
}

nodeView.setOnClickListener(new View.OnClickListener() {
viewHolder.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (n.getClickListener() != null) {
Expand All @@ -275,7 +275,7 @@ public void onClick(View v) {
}
});

nodeView.setOnLongClickListener(new View.OnLongClickListener() {
viewHolder.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View view) {
if (n.getLongClickListener() != null) {
Expand Down Expand Up @@ -408,7 +408,7 @@ private TreeNode.BaseNodeViewHolder getViewHolderForNode(TreeNode node) {
viewHolder.setContainerStyle(containerStyle);
}
if (viewHolder.getTreeView() == null) {
viewHolder.setTreeViev(this);
viewHolder.setTreeView(this);
}
return viewHolder;
}
Expand Down