Fix highlight overlapping #1098
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This patch fixes highlight overlapping by removing rectangles that overlap each other. It also changes the threshold of considering a line to be a "full line" to be a percentage of the page size, which should help fix some cases where the highlighting on the left or right side does not form a straight vertical line. Fixes #951.
ahmedre
commented
Mar 15, 2019
| @@ -31,4 +32,8 @@ public AyahInfoDatabaseHandler getAyahInfoHandler() { | |||
| } | |||
| return databaseHandler; | |||
| } | |||
|
|
|||
| public int getPageWidth() { | |||
| return Integer.valueOf(widthParameter.substring(1)); | |||
There was a problem hiding this comment.
this is a bit of a hack, but it's the easiest way to do this at the moment. in the future, should just provide the actual width.
| @@ -25,7 +24,7 @@ | |||
|
|
|||
| @ActivityScope | |||
| public class CoordinatesModel { | |||
| private static final int PIXEL_THRESHOLD = 10; | |||
| private static final float THRESHOLD_PERCENTAGE = 0.015f; | |||
There was a problem hiding this comment.
1.5% of the page width
| @@ -141,7 +174,7 @@ private AyahCoordinates normalizePageAyahs(AyahCoordinates ayahCoordinates) { | |||
| if (lastRect.left < firstRect.right) { | |||
| RectF middleBounds = new RectF(lastRect.left, | |||
| /* top= */ firstRect.bottom, | |||
| firstRect.right, | |||
| Math.min(firstRect.right, lastRect.right), | |||
There was a problem hiding this comment.
instead of just taking firstRect.right, take the left most one. this fixes where the lines are drawn in very rare cases (like 1:7).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch fixes highlight overlapping by removing rectangles that
overlap each other. It also changes the threshold of considering a line
to be a "full line" to be a percentage of the page size, which should
help fix some cases where the highlighting on the left or right side
does not form a straight vertical line. Fixes #951.