Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f2c9397 authored by Raph Levien's avatar Raph Levien Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'grapheme-dr1.5' into mnc-dr1.5-dev 

* changes:
  Respect grapheme clusters in Layout#getOffsetForHorizontal.
  Fix: Cursor can be at an invalid offset in EditText.
parents 36c5ab35 5bff01d7

core/java/android/text/Layout.java

+34 −22
Original line number Diff line number Diff line
@@ -1130,20 +1130,31 @@ public abstract class Layout { 
     */

    public int getOffsetForHorizontal(int line, float horiz) {

        // TODO: use Paint.getOffsetForAdvance to avoid binary search

        int max = getLineEnd(line) - 1;

        int min = getLineStart(line);

        final int lineEndOffset = getLineEnd(line);

        final int lineStartOffset = getLineStart(line);



        Directions dirs = getLineDirections(line);



        if (line == getLineCount() - 1)

            max++;

        TextLine tl = TextLine.obtain();

        // XXX: we don't care about tabs as we just use TextLine#getOffsetToLeftRightOf here.

        tl.set(mPaint, mText, lineStartOffset, lineEndOffset, getParagraphDirection(line), dirs,

                false, null);



        int best = min;

        final int max;

        if (line == getLineCount() - 1) {

            max = lineEndOffset;

        } else {

            max = tl.getOffsetToLeftRightOf(lineEndOffset - lineStartOffset,

                    !isRtlCharAt(lineEndOffset - 1)) + lineStartOffset;

        }

        int best = lineStartOffset;

        float bestdist = Math.abs(getPrimaryHorizontal(best) - horiz);



        for (int i = 0; i < dirs.mDirections.length; i += 2) {

            int here = min + dirs.mDirections[i];

            int here = lineStartOffset + dirs.mDirections[i];

            int there = here + (dirs.mDirections[i+1] & RUN_LENGTH_MASK);

            int swap = (dirs.mDirections[i+1] & RUN_RTL_FLAG) != 0 ? -1 : 1;

            boolean isRtl = (dirs.mDirections[i+1] & RUN_RTL_FLAG) != 0;

            int swap = isRtl ? -1 : 1;



            if (there > max)

                there = max;
@@ -1163,11 +1174,10 @@ public abstract class Layout { 
                low = here + 1;



            if (low < there) {

                low = getOffsetAtStartOf(low);



                int aft = tl.getOffsetToLeftRightOf(low - lineStartOffset, isRtl) + lineStartOffset;

                low = tl.getOffsetToLeftRightOf(aft - lineStartOffset, !isRtl) + lineStartOffset;

                if (low >= here && low < there) {

                    float dist = Math.abs(getPrimaryHorizontal(low) - horiz);



                int aft = TextUtils.getOffsetAfter(mText, low);

                    if (aft < there) {

                        float other = Math.abs(getPrimaryHorizontal(aft) - horiz);
@@ -1182,6 +1192,7 @@ public abstract class Layout { 
                        best = low;

                    }

                }

            }



            float dist = Math.abs(getPrimaryHorizontal(here) - horiz);
@@ -1198,6 +1209,7 @@ public abstract class Layout { 
            best = max;

        }



        TextLine.recycle(tl);

        return best;

    }