Skip to content

Commit

Permalink
Make drawing methods visible to subclasses
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rosemoe
Rosemoe committed Oct 1, 2021
1 parent b9812e5 commit f20b1e9
Showing 1 changed file with 39 additions and 58 deletions.
97 changes: 39 additions & 58 deletions editor/src/main/java/io/github/rosemoe/sora/widget/CodeEditor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
import android.graphics.Path;
import android.graphics.Rect;
import android.graphics.RectF;
import android.graphics.RenderNode;
import android.graphics.Typeface;
import android.os.Build;
import android.os.Bundle;
Expand Down Expand Up @@ -932,7 +931,7 @@ public void setTextSizePx(@Px float size) {
*
* @param size Text size in pixel unit
*/
void setTextSizePxDirect(float size) {
protected void setTextSizePxDirect(float size) {
mPaint.setTextSize(size);
mPaintOther.setTextSize(size);
mPaintGraph.setTextSize(size * SCALE_MINI_GRAPH);
Expand All @@ -947,7 +946,7 @@ void setTextSizePxDirect(float size) {
*
* @param canvas Canvas you want to draw
*/
private void drawView(Canvas canvas) {
protected void drawView(Canvas canvas) {
mSpanner.notifyRecycle();
if (mFormatThread != null) {
String text = "Formatting your code...";
Expand Down Expand Up @@ -1079,7 +1078,7 @@ private int clearFlag(int flags, int flag) {
/**
* Whether non-printable is to be drawn
*/
private boolean shouldInitializeNonPrintable() {
protected boolean shouldInitializeNonPrintable() {
return clearFlag(mNonPrintableOptions, FLAG_DRAW_WHITESPACE_FOR_EMPTY_LINE) != 0;
}

Expand All @@ -1091,7 +1090,7 @@ private boolean shouldInitializeNonPrintable() {
* @param postDrawLineNumbers Line numbers to be drawn later
* @param postDrawCursor Cursors to be drawn later
*/
private void drawRows(Canvas canvas, float offset, LongArrayList postDrawLineNumbers, List<CursorPaintAction> postDrawCursor, LongArrayList postDrawCurrentLines, MutableInt requiredFirstLn) {
protected void drawRows(Canvas canvas, float offset, LongArrayList postDrawLineNumbers, List<CursorPaintAction> postDrawCursor, LongArrayList postDrawCurrentLines, MutableInt requiredFirstLn) {
final float waveLength = getDpUnit() * 18;
final float amplitude = getDpUnit() * 4;
RowIterator rowIterator = mLayout.obtainRowIterator(getFirstVisibleRow());
Expand Down Expand Up @@ -1395,7 +1394,7 @@ protected void showTextActionPopup() {
/**
* Draw small characters as graph
*/
private void drawMiniGraph(Canvas canvas, float offset, int row, String graph) {
protected void drawMiniGraph(Canvas canvas, float offset, int row, String graph) {
// Draw
mPaintGraph.setColor(mColors.getColor(EditorColorScheme.NON_PRINTABLE_CHAR));
float baseline = getRowBottom(row) - getOffsetY() - mGraphMetrics.descent;
Expand All @@ -1405,7 +1404,7 @@ private void drawMiniGraph(Canvas canvas, float offset, int row, String graph) {
/**
* Draw non-printable characters
*/
private void drawWhitespaces(Canvas canvas, float offset, int row, int rowStart, int rowEnd, int min, int max, float circleRadius) {
protected void drawWhitespaces(Canvas canvas, float offset, int row, int rowStart, int rowEnd, int min, int max, float circleRadius) {
int paintStart = Math.max(rowStart, Math.min(rowEnd, min));
int paintEnd = Math.max(rowStart, Math.min(rowEnd, max));
mPaintOther.setColor(mColors.getColor(EditorColorScheme.NON_PRINTABLE_CHAR));
Expand Down Expand Up @@ -1441,7 +1440,7 @@ private void drawWhitespaces(Canvas canvas, float offset, int row, int rowStart,
*
* @param line The line to search
*/
private long findLeadingAndTrailingWhitespacePos(int line) {
protected long findLeadingAndTrailingWhitespacePos(int line) {
int column = mText.getColumnCount(line);
int leading = 0;
int trailing = column;
Expand Down Expand Up @@ -1470,7 +1469,7 @@ private boolean isWhitespace(char ch) {
* @param line Target line
* @param positions Outputs start positions
*/
private void computeMatchedPositions(int line, List<Integer> positions) {
protected void computeMatchedPositions(int line, List<Integer> positions) {
positions.clear();
CharSequence pattern = mSearcher.mSearchText;
if (pattern == null || pattern.length() == 0) {
Expand Down Expand Up @@ -1516,7 +1515,7 @@ private boolean isInside(int index, int start, int end, int line) {
* @param highlightEnd Region end
* @param color Color of background
*/
private void drawRowRegionBackground(Canvas canvas, float paintingOffset, int row, int firstVis, int lastVis, int highlightStart, int highlightEnd, int color) {
protected void drawRowRegionBackground(Canvas canvas, float paintingOffset, int row, int firstVis, int lastVis, int highlightStart, int highlightEnd, int color) {
int paintStart = Math.min(Math.max(firstVis, highlightStart), lastVis);
int paintEnd = Math.min(Math.max(firstVis, highlightEnd), lastVis);
if (paintStart != paintEnd) {
Expand All @@ -1540,7 +1539,7 @@ private void drawRowRegionBackground(Canvas canvas, float paintingOffset, int ro
* @param columnCount Column count of line
* @param color Color of normal text in this region
*/
private void drawRegionText(Canvas canvas, float offsetX, float baseline, int line, int startIndex, int endIndex, int columnCount, int color) {
protected void drawRegionText(Canvas canvas, float offsetX, float baseline, int line, int startIndex, int endIndex, int columnCount, int color) {
boolean hasSelectionOnLine = mCursor.isSelected() && line >= mCursor.getLeftLine() && line <= mCursor.getRightLine();
int selectionStart = 0;
int selectionEnd = columnCount;
Expand Down Expand Up @@ -1602,7 +1601,7 @@ private void drawRegionText(Canvas canvas, float offsetX, float baseline, int li
*
* @param canvas The canvas to draw
*/
private void drawEdgeEffect(Canvas canvas) {
protected void drawEdgeEffect(Canvas canvas) {
boolean postDraw = false;
if (!mVerticalEdgeGlow.isFinished()) {
boolean bottom = mEventHandler.topOrBottom;
Expand Down Expand Up @@ -1660,7 +1659,7 @@ private void drawEdgeEffect(Canvas canvas) {
* @param resultRect The rect of handle this method drew
* @param handleType The selection handle type (LEFT, RIGHT,BOTH or -1)
*/
private void drawHandle(Canvas canvas, int row, float centerX, RectF resultRect, int handleType) {
protected void drawHandle(Canvas canvas, int row, float centerX, RectF resultRect, int handleType) {
float radius = mDpUnit * 12;

if (handleType > -1 && handleType == mEventHandler.getTouchedHandleType()) {
Expand Down Expand Up @@ -1690,7 +1689,7 @@ private void drawHandle(Canvas canvas, int row, float centerX, RectF resultRect,
* @param canvas The canvas to draw
* @param offsetX The start x offset for text
*/
private void drawBlockLines(Canvas canvas, float offsetX) {
protected void drawBlockLines(Canvas canvas, float offsetX) {
List<BlockLine> blocks = mSpanner == null ? null : mSpanner.getResult().getBlocks();
if (blocks == null || blocks.isEmpty()) {
return;
Expand Down Expand Up @@ -1741,7 +1740,7 @@ private void drawBlockLines(Canvas canvas, float offsetX) {
*
* @param canvas The canvas to draw
*/
private void drawScrollBars(Canvas canvas) {
protected void drawScrollBars(Canvas canvas) {
mVerticalScrollBar.setEmpty();
mHorizontalScrollBar.setEmpty();
if (!mEventHandler.shouldDrawScrollBar()) {
Expand All @@ -1762,7 +1761,7 @@ private void drawScrollBars(Canvas canvas) {
*
* @param canvas Canvas to draw
*/
private void drawScrollBarTrackVertical(Canvas canvas) {
protected void drawScrollBarTrackVertical(Canvas canvas) {
if (mEventHandler.holdVerticalScrollBar()) {
mRect.right = getWidth();
mRect.left = getWidth() - mDpUnit * 10;
Expand All @@ -1777,7 +1776,7 @@ private void drawScrollBarTrackVertical(Canvas canvas) {
*
* @param canvas Canvas to draw
*/
private void drawScrollBarVertical(Canvas canvas) {
protected void drawScrollBarVertical(Canvas canvas) {
int page = getHeight();
float all = mLayout.getLayoutHeight() + getHeight() / 2f;
float length = page / all * getHeight();
Expand Down Expand Up @@ -1807,7 +1806,7 @@ private void drawScrollBarVertical(Canvas canvas) {
* @param centerY The center y on screen for the panel
* @param rightX The right x on screen for the panel
*/
private void drawLineInfoPanel(Canvas canvas, float centerY, float rightX) {
protected void drawLineInfoPanel(Canvas canvas, float centerY, float rightX) {
if (!mDisplayLnPanel) {
return;
}
Expand Down Expand Up @@ -1838,7 +1837,7 @@ private void drawLineInfoPanel(Canvas canvas, float centerY, float rightX) {
*
* @param canvas Canvas to draw
*/
private void drawScrollBarTrackHorizontal(Canvas canvas) {
protected void drawScrollBarTrackHorizontal(Canvas canvas) {
if (mEventHandler.holdHorizontalScrollBar()) {
mRect.top = getHeight() - mDpUnit * 10;
mRect.bottom = getHeight();
Expand All @@ -1853,7 +1852,7 @@ private void drawScrollBarTrackHorizontal(Canvas canvas) {
*
* @param canvas Canvas to draw
*/
private void drawScrollBarHorizontal(Canvas canvas) {
protected void drawScrollBarHorizontal(Canvas canvas) {
int page = getWidth();
float all = getScrollMaxX() + getWidth();
float length = page / all * getWidth();
Expand All @@ -1869,7 +1868,7 @@ private void drawScrollBarHorizontal(Canvas canvas) {
/**
* Draw cursor
*/
private void drawCursor(Canvas canvas, float centerX, int row, RectF handle, boolean insert) {
protected void drawCursor(Canvas canvas, float centerX, int row, RectF handle, boolean insert) {
if (!insert || mCursorBlink == null || mCursorBlink.visibility) {
mRect.top = getRowTop(row) - getOffsetY();
mRect.bottom = getRowBottom(row) - getOffsetY();
Expand All @@ -1885,7 +1884,7 @@ private void drawCursor(Canvas canvas, float centerX, int row, RectF handle, boo
/**
* Draw cursor
*/
private void drawCursor(Canvas canvas, float centerX, int row, RectF handle, boolean insert, int handleType) {
protected void drawCursor(Canvas canvas, float centerX, int row, RectF handle, boolean insert, int handleType) {
if (!insert || mCursorBlink == null || mCursorBlink.visibility) {
mRect.top = getRowTop(row) - getOffsetY();
mRect.bottom = getRowBottom(row) - getOffsetY();
Expand Down Expand Up @@ -2027,7 +2026,7 @@ private int binarySearchEndBlock(int firstVis, List<BlockLine> blocks) {
* @param count Count of characters
* @return The width measured
*/
private float measureText(char[] src, int index, int count) {
protected float measureText(char[] src, int index, int count) {
int tabCount = 0;
for (int i = 0; i < count; i++) {
if (src[index + i] == '\t') {
Expand All @@ -2046,7 +2045,7 @@ private float measureText(char[] src, int index, int count) {
* @param count Count of characters
* @return The width measured
*/
private float measureText(CharSequence text, int index, int count) {
protected float measureText(CharSequence text, int index, int count) {
int tabCount = 0;
for (int i = 0; i < count; i++) {
if (text.charAt(index + i) == '\t') {
Expand All @@ -2067,7 +2066,7 @@ private float measureText(CharSequence text, int index, int count) {
* @param offX Offset x for paint
* @param offY Offset y for paint(baseline)
*/
private void drawText(Canvas canvas, char[] src, int index, int count, float offX, float offY) {
protected void drawText(Canvas canvas, char[] src, int index, int count, float offX, float offY) {
canvas.drawText(src, index, count, offX, offY, mPaint);
int end = index + count;
if (mCharPaint) {
Expand All @@ -2093,7 +2092,7 @@ private void drawText(Canvas canvas, char[] src, int index, int count, float off
/**
* Find first visible character
*/
private float[] findFirstVisibleChar(float initialPosition, int left, int right, char[] chars) {
protected float[] findFirstVisibleChar(float initialPosition, int left, int right, char[] chars) {
float width = 0f;
float target = mFontCache.measureChar(' ', mPaint) * getTabWidth() * 1.1f;
while (left < right && initialPosition + width < -target) {
Expand All @@ -2112,7 +2111,7 @@ private float[] findFirstVisibleChar(float initialPosition, int left, int right,
*
* @param line Line going to draw or measure
*/
private void prepareLine(int line) {
protected void prepareLine(int line) {
int length = mText.getColumnCount(line);
if (length >= mBuffer.length) {
mBuffer = new char[length + 100];
Expand All @@ -2123,11 +2122,11 @@ private void prepareLine(int line) {
/**
* Draw background for whole row
*/
private void drawRowBackground(Canvas canvas, int color, int row) {
protected void drawRowBackground(Canvas canvas, int color, int row) {
drawRowBackground(canvas, color, row, mViewRect.right);
}

private void drawRowBackground(Canvas canvas, int color, int row, int right) {
protected void drawRowBackground(Canvas canvas, int color, int row, int right) {
mRect.top = getRowTop(row) - getOffsetY();
mRect.bottom = getRowBottom(row) - getOffsetY();
mRect.left = 0;
Expand All @@ -2138,7 +2137,7 @@ private void drawRowBackground(Canvas canvas, int color, int row, int right) {
/**
* Draw single line number
*/
private void drawLineNumber(Canvas canvas, int line, int row, float offsetX, float width, int color) {
protected void drawLineNumber(Canvas canvas, int line, int row, float offsetX, float width, int color) {
if (width + offsetX <= 0) {
return;
}
Expand Down Expand Up @@ -2184,7 +2183,7 @@ private void drawLineNumber(Canvas canvas, int line, int row, float offsetX, flo
* @param width Width of line number region
* @param color Color of line number background
*/
private void drawLineNumberBackground(Canvas canvas, float offsetX, float width, int color) {
protected void drawLineNumberBackground(Canvas canvas, float offsetX, float width, int color) {
float right = offsetX + width;
if (right < 0) {
return;
Expand All @@ -2209,7 +2208,7 @@ private void drawLineNumberBackground(Canvas canvas, float offsetX, float width,
* @param offsetX End x of line number region
* @param color Color to draw divider
*/
private void drawDivider(Canvas canvas, float offsetX, int color) {
protected void drawDivider(Canvas canvas, float offsetX, int color) {
float right = offsetX + mDividerWidth;
if (right < 0) {
return;
Expand All @@ -2232,7 +2231,7 @@ private void drawDivider(Canvas canvas, float offsetX, int color) {
*
* @return width of line number region
*/
private float measureLineNumber() {
protected float measureLineNumber() {
if (!isLineNumberEnabled()) {
return 0f;
}
Expand All @@ -2253,7 +2252,7 @@ private float measureLineNumber() {
/**
* Create layout for text
*/
void createLayout() {
protected void createLayout() {
if (mLayout != null) {
mLayout.destroyLayout();
}
Expand All @@ -2276,7 +2275,7 @@ void createLayout() {
* @param color Color of rect
* @param rect Rect to draw
*/
private void drawColor(Canvas canvas, int color, RectF rect) {
protected void drawColor(Canvas canvas, int color, RectF rect) {
if (color != 0) {
mPaint.setColor(color);
canvas.drawRect(rect, mPaint);
Expand All @@ -2291,7 +2290,7 @@ private void drawColor(Canvas canvas, int color, RectF rect) {
* @param color Color of rect
* @param rect Rect to draw
*/
private void drawColor(Canvas canvas, int color, Rect rect) {
protected void drawColor(Canvas canvas, int color, Rect rect) {
if (color != 0) {
mPaint.setColor(color);
canvas.drawRect(rect, mPaint);
Expand All @@ -2311,7 +2310,7 @@ private void commitTab() {
/**
* Whether span map is valid
*/
private boolean isSpanMapPrepared(boolean insert, int delta) {
protected boolean isSpanMapPrepared(boolean insert, int delta) {
List<List<Span>> map = mSpanner.getResult().getSpanMap();
if (map != null) {
if (insert) {
Expand All @@ -2327,7 +2326,7 @@ private boolean isSpanMapPrepared(boolean insert, int delta) {
/**
* Exit select mode after text changed
*/
private void exitSelectModeIfNeeded() {
protected void exitSelectModeIfNeeded() {
if (!mCursor.isSelected()) {
mTextActionPresenter.onExit();
}
Expand All @@ -2336,7 +2335,7 @@ private void exitSelectModeIfNeeded() {
/**
* Apply new position of auto completion window
*/
private void updateCompletionWindowPosition() {
protected void updateCompletionWindowPosition() {
float panelX = updateCursorAnchor() + mDpUnit * 20;
float[] rightLayoutOffset = mLayout.getCharLayoutOffset(mCursor.getRightLine(), mCursor.getRightColumn());
float panelY = rightLayoutOffset[0] - getOffsetY() + getRowHeight() / 2f;
Expand Down Expand Up @@ -3911,25 +3910,7 @@ protected void onSelectionChanged() {
@Override
protected void onDraw(Canvas canvas) {
super.onDraw(canvas);
/*if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q){
// Render test
Log.d(LOG_TAG, "RenderNode Test");
RenderNode displayList = new RenderNode("editorTestRenderNode");
displayList.setPosition(mViewRect);
Canvas local = displayList.beginRecording();
long time = System.currentTimeMillis();
drawView(local);
Log.i(LOG_TAG, "Draw to RenderNode = " + (System.currentTimeMillis() - time));
displayList.endRecording();
time = System.currentTimeMillis();
//canvas.save();
//canvas.translate(50, 50);
canvas.drawRenderNode(displayList);
//canvas.restore();
Log.i(LOG_TAG, "Draw RenderNode = " + (System.currentTimeMillis() - time));
} else {*/
drawView(canvas);
//}
drawView(canvas);
}

@Override
Expand Down

0 comments on commit f20b1e9

Please sign in to comment.