mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: enable AA for selections and handles, tune colors & alpha

Browse Source 
Change-Id: Ieea5b084ce1b9550d202bff795d89929632cb724
This commit is contained in:
Tomaž Vajngerl
2015-03-31 13:16:44 +09:00
committed by Miklos Vajna
parent 812970c785
commit d7716c9927
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java
View File

@@ -24,7 +24,8 @@ import static org.libreoffice.canvas.GraphicSelectionHandle.HandlePosition;
* rectangle. * rectangle.
*/ */
public class GraphicSelection implements CanvasElement { public class GraphicSelection implements CanvasElement {
private final Paint mPaint; private final Paint mPaintStroke;
private final Paint mPaintFill;
public RectF mRectangle = new RectF(); public RectF mRectangle = new RectF();
public RectF mScaledRectangle = new RectF(); public RectF mScaledRectangle = new RectF();
private RectF mDrawRectangle = new RectF(); private RectF mDrawRectangle = new RectF();
@@ -39,10 +40,17 @@ public class GraphicSelection implements CanvasElement {
*/ */
public GraphicSelection() { public GraphicSelection() {
// Create the paint, which is needed at drawing // Create the paint, which is needed at drawing
mPaint = new Paint(); mPaintStroke = new Paint();
mPaint.setStyle(Paint.Style.STROKE); mPaintStroke.setStyle(Paint.Style.STROKE);
mPaint.setColor(Color.BLACK); mPaintStroke.setColor(Color.GRAY);
mPaint.setStrokeWidth(2); mPaintStroke.setStrokeWidth(2);
mPaintStroke.setAntiAlias(true);
mPaintFill = new Paint();
mPaintFill.setStyle(Paint.Style.FILL);
mPaintFill.setColor(Color.WHITE);
mPaintFill.setAlpha(200);
mPaintFill.setAntiAlias(true);
// Create the handles of the selection // Create the handles of the selection
mHandles[0] = new GraphicSelectionHandle(HandlePosition.TOP_LEFT); mHandles[0] = new GraphicSelectionHandle(HandlePosition.TOP_LEFT);
@@ -95,7 +103,10 @@ public class GraphicSelection implements CanvasElement {
*/ */
@Override @Override
public void draw(Canvas canvas) { public void draw(Canvas canvas) {
canvas.drawRect(mDrawRectangle, mPaint); canvas.drawRect(mDrawRectangle, mPaintStroke);
if (mType != DragType.NONE) {
canvas.drawRect(mDrawRectangle, mPaintFill);
}
for (GraphicSelectionHandle handle : mHandles) { for (GraphicSelectionHandle handle : mHandles) {
handle.draw(canvas); handle.draw(canvas);
} }

9
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java
View File

@@ -42,14 +42,19 @@ public class GraphicSelectionHandle implements CanvasElement {
mHandlePosition = position; mHandlePosition = position;
mStrokePaint.setStyle(Paint.Style.STROKE); mStrokePaint.setStyle(Paint.Style.STROKE);
mStrokePaint.setColor(Color.BLACK); mStrokePaint.setColor(Color.GRAY);
mStrokePaint.setStrokeWidth(3); mStrokePaint.setStrokeWidth(3);
mStrokePaint.setAntiAlias(true);
mFillPaint.setStyle(Paint.Style.FILL); mFillPaint.setStyle(Paint.Style.FILL);
mFillPaint.setColor(Color.WHITE); mFillPaint.setColor(Color.WHITE);
mFillPaint.setAlpha(200);
mFillPaint.setAntiAlias(true);
mSelectedFillPaint.setStyle(Paint.Style.FILL); mSelectedFillPaint.setStyle(Paint.Style.FILL);
mSelectedFillPaint.setColor(Color.BLUE); mSelectedFillPaint.setColor(Color.GRAY);
mSelectedFillPaint.setAlpha(200);
mSelectedFillPaint.setAntiAlias(true);
} }
/** /**