gwh/LightningLauncher-TrianguloY
1
0
Fork 0
mirror of https://github.com/TrianguloY/LightningLauncher.git synced 2024-12-26 09:58:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve the dot indicator rendering, and change the default values. It fixes the clipping seen with hairline stroking (width=0 or 1).

Browse source
This commit is contained in:
Pierrot 2019-05-01 10:08:01 +02:00
parent b3e8e721f9
commit f131f836ed
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/llx/core/src/main/java/net/pierrox/lightning_launcher/data/PageIndicator.java
View file

@ -35,8 +35,8 @@ public class PageIndicator extends Item implements ShortcutConfigStylable {
public int dotsMarginX = 10; public int dotsMarginX = 10;
public int dotsMarginY = 10; public int dotsMarginY = 10;
public int dotsOuterRadius = 8; public int dotsOuterRadius = 8;
public int dotsInnerRadius = 6; public int dotsInnerRadius = 5;
public int dotsOuterStrokeWidth = 0; public int dotsOuterStrokeWidth = 2;
public int dotsOuterColor = Color.WHITE; public int dotsOuterColor = Color.WHITE;
public int dotsInnerColor = Color.WHITE; public int dotsInnerColor = Color.WHITE;
public String rawFormat = "%1$+5.0f %2$+5.0f | %3$6.3f"; public String rawFormat = "%1$+5.0f %2$+5.0f | %3$6.3f";

15
app/llx/core/src/main/java/net/pierrox/lightning_launcher/views/item/PageIndicatorView.java
View file

@ -142,7 +142,8 @@ public class PageIndicatorView extends ItemView {
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
final int px = mMaxX - mMinX; final int px = mMaxX - mMinX;
final int py = mMaxY - mMinY; final int py = mMaxY - mMinY;
float radius = Math.max(mPageIndicator.dotsInnerRadius, mPageIndicator.dotsOuterRadius + mPageIndicator.dotsOuterStrokeWidth /2); float stroke_width = mPageIndicator.dotsOuterStrokeWidth == 0 ? 1 : mPageIndicator.dotsOuterStrokeWidth;
float radius = Math.max(mPageIndicator.dotsInnerRadius, mPageIndicator.dotsOuterRadius + stroke_width);
int width = (int) Math.ceil((radius * 2) * px + mPageIndicator.dotsMarginX * (px>0 ? px-1 : 0)); int width = (int) Math.ceil((radius * 2) * px + mPageIndicator.dotsMarginX * (px>0 ? px-1 : 0));
int height = (int) Math.ceil((radius * 2) * py + mPageIndicator.dotsMarginY * (py>0 ? py-1 : 0)); int height = (int) Math.ceil((radius * 2) * py + mPageIndicator.dotsMarginY * (py>0 ? py-1 : 0));
setMeasuredDimension(width, height); setMeasuredDimension(width, height);
@ -161,7 +162,13 @@ public class PageIndicatorView extends ItemView {
return; return;
} }
float radius = Math.max(mPageIndicator.dotsInnerRadius, mPageIndicator.dotsOuterRadius + mPageIndicator.dotsOuterStrokeWidth /2);
float stroke_width = mPageIndicator.dotsOuterStrokeWidth == 0 ? 1 : mPageIndicator.dotsOuterStrokeWidth;
// compute the anti aliasing delta : shift the drawing so that the outer circle is always perfectly aligned
float ad = (stroke_width % 2) == 0 ? 0 : 0.5f;
float radius = Math.max(mPageIndicator.dotsInnerRadius, mPageIndicator.dotsOuterRadius + stroke_width);
float scaled_cont_x = -(mContainerX-mContainerWidth/2)/mContainerScale; float scaled_cont_x = -(mContainerX-mContainerWidth/2)/mContainerScale;
float scaled_cont_y = -(mContainerY-mContainerHeight/2)/mContainerScale; float scaled_cont_y = -(mContainerY-mContainerHeight/2)/mContainerScale;
float pos_x_f = scaled_cont_x / mContainerWidth - 0.5f; float pos_x_f = scaled_cont_x / mContainerWidth - 0.5f;
@ -172,7 +179,7 @@ public class PageIndicatorView extends ItemView {
for(int y=mMinY; y<mMaxY; y++) { for(int y=mMinY; y<mMaxY; y++) {
float cx = radius; float cx = radius;
for(int x=mMinX; x<mMaxX; x++) { for(int x=mMinX; x<mMaxX; x++) {
canvas.drawCircle(cx, cy, mPageIndicator.dotsOuterRadius, mOuterCirclePaint); canvas.drawCircle(cx+ad, cy+ad, mPageIndicator.dotsOuterRadius, mOuterCirclePaint);
if(x == mMinX && pos_x_f > mMaxX-1) { if(x == mMinX && pos_x_f > mMaxX-1) {
pos_x_f = x - mMaxX + pos_x_f; pos_x_f = x - mMaxX + pos_x_f;
@ -189,7 +196,7 @@ public class PageIndicatorView extends ItemView {
if(dx>1) dx=1; dx = 1-dx; if(dx>1) dx=1; dx = 1-dx;
if(dy>1) dy=1; dy = 1-dy; if(dy>1) dy=1; dy = 1-dy;
mInnerCirclePaint.setAlpha((int) (255*dx*dy*max_alpha)); mInnerCirclePaint.setAlpha((int) (255*dx*dy*max_alpha));
canvas.drawCircle(cx, cy, mPageIndicator.dotsInnerRadius, mInnerCirclePaint); canvas.drawCircle(cx+ad, cy+ad, mPageIndicator.dotsInnerRadius, mInnerCirclePaint);
cx += radius*2 + mPageIndicator.dotsMarginX; cx += radius*2 + mPageIndicator.dotsMarginX;
} }