[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - android/experimental

[Tomaž Vajngerl]

 android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java       |   23 +++++++---
 android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java |    9 +++
 2 files changed, 24 insertions(+), 8 deletions(-)

New commits:
commit 4b1f357108057bb1f2673c64fd27341f8be479d7
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Tue Mar 31 13:16:44 2015 +0900

    android: enable AA for selections and handles, tune colors & alpha
    
    Change-Id: Ieea5b084ce1b9550d202bff795d89929632cb724

diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java
index 49bec56..3fa4619 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java
@@ -24,7 +24,8 @@ import static org.libreoffice.canvas.GraphicSelectionHandle.HandlePosition;
  * rectangle.
  */
 public class GraphicSelection implements CanvasElement {
-    private final Paint mPaint;
+    private final Paint mPaintStroke;
+    private final Paint mPaintFill;
     public RectF mRectangle = new RectF();
     public RectF mScaledRectangle = new RectF();
     private RectF mDrawRectangle = new RectF();
@@ -39,10 +40,17 @@ public class GraphicSelection implements CanvasElement {
      */
     public GraphicSelection() {
         // Create the paint, which is needed at drawing
-        mPaint = new Paint();
-        mPaint.setStyle(Paint.Style.STROKE);
-        mPaint.setColor(Color.BLACK);
-        mPaint.setStrokeWidth(2);
+        mPaintStroke = new Paint();
+        mPaintStroke.setStyle(Paint.Style.STROKE);
+        mPaintStroke.setColor(Color.GRAY);
+        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
         mHandles[0] = new GraphicSelectionHandle(HandlePosition.TOP_LEFT);
@@ -95,7 +103,10 @@ public class GraphicSelection implements CanvasElement {
      */
     @Override
     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) {
             handle.draw(canvas);
         }
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java
index 52b662e..13487f6 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java
@@ -42,14 +42,19 @@ public class GraphicSelectionHandle implements CanvasElement {
         mHandlePosition = position;
 
         mStrokePaint.setStyle(Paint.Style.STROKE);
-        mStrokePaint.setColor(Color.BLACK);
+        mStrokePaint.setColor(Color.GRAY);
         mStrokePaint.setStrokeWidth(3);
+        mStrokePaint.setAntiAlias(true);
 
         mFillPaint.setStyle(Paint.Style.FILL);
         mFillPaint.setColor(Color.WHITE);
+        mFillPaint.setAlpha(200);
+        mFillPaint.setAntiAlias(true);
 
         mSelectedFillPaint.setStyle(Paint.Style.FILL);
-        mSelectedFillPaint.setColor(Color.BLUE);
+        mSelectedFillPaint.setColor(Color.GRAY);
+        mSelectedFillPaint.setAlpha(200);
+        mSelectedFillPaint.setAntiAlias(true);
     }
 
     /**