Improve scroll, do not scroll out of bound

tranleduy2000 · May 29, 2018 · bd2c4a9 · bd2c4a9
1 parent 837c1fa
commit bd2c4a9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/app/src/main/java/com/duy/ccppcompiler/compiler/compilers/MakeCompiler.java b/app/src/main/java/com/duy/ccppcompiler/compiler/compilers/MakeCompiler.java
@@ -17,6 +17,9 @@
 package com.duy.ccppcompiler.compiler.compilers;
 
 import android.content.Context;
+import android.support.annotation.NonNull;
+
+import com.duy.ccppcompiler.compiler.shell.CommandResult;
 
 import java.io.File;
 
@@ -41,4 +44,10 @@ protected String buildArgs(File[] sourceFiles) {
     protected String getCompilerProgram() {
         return MARK_PROGRAM;
     }
+
+    @NonNull
+    @Override
+    protected CommandResult execCommand(@NonNull Context context, @NonNull String workingDir, @NonNull String cmd) {
+        return super.execCommand(context, workingDir, cmd);
+    }
 }
diff --git a/editor/src/main/java/android/core/widget/EditAreaView.java b/editor/src/main/java/android/core/widget/EditAreaView.java
@@ -20,12 +20,14 @@
 
 import android.content.Context;
 import android.core.content.UndoManager;
+import android.core.text.Layout;
 import android.core.text.Selection;
 import android.core.text.method.ArrowKeyMovementMethod;
 import android.core.text.method.MovementMethod;
 import android.core.view.InputMethodManagerCompat;
 import android.core.widget.model.EditorIndex;
 import android.graphics.Canvas;
+import android.graphics.Rect;
 import android.support.annotation.Nullable;
 import android.text.Editable;
 import android.text.InputFilter;
@@ -370,7 +372,16 @@ public int realLineToVirtualLine(int realLine) {
      */
     public void scrollToLine(int virtualLine) {
         virtualLine = Math.max(0, Math.min(virtualLine, getLineCount() - 1));
-        int y = getLayout().getLineTop(virtualLine);
+        final Layout layout = getLayout();
+        final int layoutHeight = layout.getHeight();
+
+
+        Rect bound = new Rect();
+        getGlobalVisibleRect(bound);
+        final int visibleHeight = bound.height();
+
+        int y = layout.getLineTop(virtualLine);
+        y = Math.min(y, layoutHeight - visibleHeight);
         scrollTo(getScrollX(), y);
     }