Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions src/jk.widget.common/TextAreaWidget.sling
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,19 @@ ctor(context as GuiApplicationContext)
}
}
});
setOnTouchListener(new android.view.View.OnTouchListener() {
public boolean onTouch(android.view.View v, android.view.MotionEvent event) {
if (hasFocus()) {
getParent().requestDisallowInterceptTouchEvent(true);
switch (event.getAction() & android.view.MotionEvent.ACTION_MASK){
case android.view.MotionEvent.ACTION_SCROLL:
getParent().requestDisallowInterceptTouchEvent(false);
return true;
}
}
return false;
}
});
}}}
}
ELSE IFDEF "target_kotlin" {
Expand Down
4 changes: 2 additions & 2 deletions src/jk.widget/ImageWidget.sling
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ func setWidgetImageScaleMethod(method as int)
IFDEF "target_java" {
if method == FIT {
lang "java" {{{
setScaleType(android.widget.ImageView.ScaleType.CENTER_INSIDE);
setScaleType(android.widget.ImageView.ScaleType.FIT_CENTER);
}}}
}
else if method == FILL {
Expand All @@ -185,7 +185,7 @@ func setWidgetImageScaleMethod(method as int)
ELSE IFDEF "target_kotlin" {
if method == FIT {
lang "kotlin" {{{
setScaleType(android.widget.ImageView.ScaleType.CENTER_INSIDE)
setScaleType(android.widget.ImageView.ScaleType.FIT_CENTER)
}}}
}
else if method == FILL {
Expand Down