tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ui): cannot redo and undo

Browse Source
This commit is contained in:
hyb1996
2018-09-13 16:30:18 +08:00
parent ccf85fe2f5
commit 4fe8e4add4
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditor.java
View File

@@ -144,7 +144,7 @@ public class CodeEditor extends HVScrollView {
} }
public boolean canUndo() { public boolean canUndo() {
return mTextViewRedoUndo.canRedo(); return mTextViewRedoUndo.canUndo();
} }
public boolean canRedo() { public boolean canRedo() {

3
app/src/main/java/org/autojs/autojs/ui/edit/editor/TextViewUndoRedo.java
View File

@@ -419,6 +419,9 @@ public class TextViewUndoRedo {
} }
public void afterTextChanged(Editable s) { public void afterTextChanged(Editable s) {
if (mIsUndoOrRedo || !mEnabled) {
return;
}
if (mEditHistory.size() < mInitialHistoryStackSize) { if (mEditHistory.size() < mInitialHistoryStackSize) {
mInitialHistoryStackSize = 0; mInitialHistoryStackSize = 0;
} }

2
app/src/main/java/org/autojs/autojs/ui/edit/toolbar/DebugToolbarFragment.java
View File

@@ -111,10 +111,10 @@ public class DebugToolbarFragment extends ToolbarFragment implements DebugCallba
return; return;
} }
CodeEditor editor = mEditorView.getEditor(); CodeEditor editor = mEditorView.getEditor();
editor.setRedoUndoEnabled(true);
if (!TextUtils.equals(mInitialEditorSourceUrl, mCurrentEditorSourceUrl)) { if (!TextUtils.equals(mInitialEditorSourceUrl, mCurrentEditorSourceUrl)) {
editor.setText(mInitialEditorSource); editor.setText(mInitialEditorSource);
} }
editor.setRedoUndoEnabled(true);
DebugBar debugBar = mEditorView.getDebugBar(); DebugBar debugBar = mEditorView.getDebugBar();
debugBar.setTitle(null); debugBar.setTitle(null);
debugBar.setCodeEvaluator(null); debugBar.setCodeEvaluator(null);