Skip to content

Commit d870419

Browse files
committed
[lib] Simplified variable names of excluded length
1 parent 0e47b07 commit d870419

File tree

1 file changed

+28
-28
lines changed
  • tehreer-android/src/main/java/com/mta/tehreer/layout

1 file changed

+28
-28
lines changed

tehreer-android/src/main/java/com/mta/tehreer/layout/GlyphRun.java

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
public class GlyphRun {
4242
private final int charStart;
4343
private final int charEnd;
44-
private final int startAddedLength;
45-
private final int endAddedLength;
44+
private final int startExtraLength;
45+
private final int endExtraLength;
4646
private final List<Object> spans;
4747
private final boolean isBackward;
4848
private final byte bidiLevel;
@@ -60,16 +60,16 @@ public class GlyphRun {
6060
private float originX;
6161
private float originY;
6262

63-
GlyphRun(int charStart, int charEnd, int startAddedLength, int endAddedLength,
63+
GlyphRun(int charStart, int charEnd, int startExtraLength, int endExtraLength,
6464
List<Object> spans, boolean isBackward, byte bidiLevel,
6565
WritingDirection writingDirection, Typeface typeface, float typeSize,
6666
float ascent, float descent, float leading,
6767
IntList glyphIds, PointList offsets, FloatList advances, IntList clusterMap,
6868
CaretEdgeList caretEdges) {
6969
this.charStart = charStart;
7070
this.charEnd = charEnd;
71-
this.startAddedLength = startAddedLength;
72-
this.endAddedLength = endAddedLength;
71+
this.startExtraLength = startExtraLength;
72+
this.endExtraLength = endExtraLength;
7373
this.spans = spans;
7474
this.isBackward = isBackward;
7575
this.writingDirection = writingDirection;
@@ -89,8 +89,8 @@ public class GlyphRun {
8989
GlyphRun(GlyphRun otherRun) {
9090
this.charStart = otherRun.charStart;
9191
this.charEnd = otherRun.charEnd;
92-
this.startAddedLength = otherRun.startAddedLength;
93-
this.endAddedLength = otherRun.endAddedLength;
92+
this.startExtraLength = otherRun.startExtraLength;
93+
this.endExtraLength = otherRun.endExtraLength;
9494
this.spans = otherRun.spans;
9595
this.isBackward = otherRun.isBackward;
9696
this.bidiLevel = otherRun.bidiLevel;
@@ -155,12 +155,12 @@ public int getCharEnd() {
155155
return charEnd;
156156
}
157157

158-
public int getStartAddedLength() {
159-
return startAddedLength;
158+
public int getStartExtraLength() {
159+
return startExtraLength;
160160
}
161161

162-
public int getEndAddedLength() {
163-
return endAddedLength;
162+
public int getEndExtraLength() {
163+
return endExtraLength;
164164
}
165165

166166
/**
@@ -306,7 +306,7 @@ public float getLeading() {
306306
* @return The typographic width of this run.
307307
*/
308308
public float getWidth() {
309-
int visibleOffset = startAddedLength;
309+
int visibleOffset = startExtraLength;
310310
int visibleLength = charEnd - charStart;
311311

312312
return caretEdges.distance(visibleOffset, visibleOffset + visibleLength);
@@ -339,10 +339,10 @@ public int getActualClusterStart(int charIndex) {
339339
throw new IllegalArgumentException(indexError);
340340
}
341341

342-
int addedStart = charStart - startAddedLength;
343-
int arrayIndex = charIndex - addedStart;
342+
int extraStart = charStart - startExtraLength;
343+
int arrayIndex = charIndex - extraStart;
344344

345-
return Clusters.actualClusterStart(clusterMap, arrayIndex) + addedStart;
345+
return Clusters.actualClusterStart(clusterMap, arrayIndex) + extraStart;
346346
}
347347

348348
/**
@@ -363,10 +363,10 @@ public int getActualClusterEnd(int charIndex) {
363363
throw new IllegalArgumentException(indexError);
364364
}
365365

366-
int addedStart = charStart - startAddedLength;
367-
int arrayIndex = charIndex - addedStart;
366+
int extraStart = charStart - startExtraLength;
367+
int arrayIndex = charIndex - extraStart;
368368

369-
return Clusters.actualClusterEnd(clusterMap, arrayIndex) + addedStart;
369+
return Clusters.actualClusterEnd(clusterMap, arrayIndex) + extraStart;
370370
}
371371

372372
/**
@@ -389,8 +389,8 @@ public int getLeadingGlyphIndex(int charIndex) {
389389
throw new IllegalArgumentException(indexError);
390390
}
391391

392-
int addedStart = charStart - startAddedLength;
393-
int arrayIndex = charIndex - addedStart;
392+
int extraStart = charStart - startExtraLength;
393+
int arrayIndex = charIndex - extraStart;
394394

395395
return Clusters.leadingGlyphIndex(clusterMap, arrayIndex, isBackward, glyphIds.size());
396396
}
@@ -415,15 +415,15 @@ public int getTrailingGlyphIndex(int charIndex) {
415415
throw new IllegalArgumentException(indexError);
416416
}
417417

418-
int addedStart = charStart - startAddedLength;
419-
int arrayIndex = charIndex - addedStart;
418+
int extraStart = charStart - startExtraLength;
419+
int arrayIndex = charIndex - extraStart;
420420

421421
return Clusters.trailingGlyphIndex(clusterMap, arrayIndex, isBackward, glyphIds.size());
422422
}
423423

424424
private float getCaretEdge(int charIndex) {
425-
int addedStart = charStart - startAddedLength;
426-
int arrayIndex = charIndex - addedStart;
425+
int extraStart = charStart - startExtraLength;
426+
int arrayIndex = charIndex - extraStart;
427427

428428
return caretEdges.get(arrayIndex);
429429
}
@@ -469,7 +469,7 @@ public float computeCharDistance(int charIndex) {
469469
* @see #computeTypographicExtent(int, int)
470470
*/
471471
public int computeNearestCharIndex(float distance) {
472-
int addedStart = charStart - startAddedLength;
472+
int extraStart = charStart - startExtraLength;
473473
boolean reversed = caretEdges.reversed();
474474

475475
int leadingCharIndex = -1;
@@ -482,7 +482,7 @@ public int computeNearestCharIndex(float distance) {
482482
int next = (reversed ? -1 : 1);
483483

484484
while (index <= charEnd && index >= charStart) {
485-
float caretEdge = caretEdges.get(index - addedStart);
485+
float caretEdge = caretEdges.get(index - extraStart);
486486

487487
if (caretEdge <= distance) {
488488
leadingCharIndex = index;
@@ -654,10 +654,10 @@ public void draw(Renderer renderer, Canvas canvas) {
654654
ClusterRange firstCluster = null;
655655
ClusterRange lastCluster = null;
656656

657-
if (startAddedLength > 0) {
657+
if (startExtraLength > 0) {
658658
firstCluster = getClusterRange(charStart, null);
659659
}
660-
if (endAddedLength > 0) {
660+
if (endExtraLength > 0) {
661661
lastCluster = getClusterRange(charEnd - 1, firstCluster);
662662
}
663663

0 commit comments

Comments
 (0)