From f520a2479f3d471c830e14373bf84574acd32763 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 6 May 2014 23:57:53 -0400 Subject: touch up modifier circle dimensions --- src/us/minak/IMEGestureOverlayView.java | 2 +- src/us/minak/IMEModifiers.java | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/us/minak/IMEGestureOverlayView.java b/src/us/minak/IMEGestureOverlayView.java index e27b70a..37724b9 100644 --- a/src/us/minak/IMEGestureOverlayView.java +++ b/src/us/minak/IMEGestureOverlayView.java @@ -64,6 +64,6 @@ public class IMEGestureOverlayView extends GestureOverlayView implements OnGestu @Override public void onDraw(Canvas canvas) { float d = Math.min(canvas.getWidth(), canvas.getHeight()); - modifiers.draw(canvas, d/2, d/2, d*.4F); + modifiers.draw(canvas, d/2, d/2, d*.47F); } } diff --git a/src/us/minak/IMEModifiers.java b/src/us/minak/IMEModifiers.java index ef49f17..d4cc6d3 100644 --- a/src/us/minak/IMEModifiers.java +++ b/src/us/minak/IMEModifiers.java @@ -25,13 +25,15 @@ public class IMEModifiers { public void draw(Canvas canvas, float cx, float cy, float r) { this.cx = cx; this.cy = cy; - innerR = r*(1.0/3.0); - outerR = (float)(r*(2.0/3.0)); + innerR = r*(1.2/3.0); + outerR = r*(1.8/3.0); radEach = (Math.PI*2.0)/modifiers.length; - + + double textR = r*.8; + double rad = 0; float[] hsv = {0F, 1F, .75F}; - + for (int i = 0; i < modifiers.length; i++) { rad = radEach * i; hsv[0] = (float)Math.toDegrees(rad); @@ -44,8 +46,8 @@ public class IMEModifiers { colorPaint); canvas.drawText( modifiers[i], - (float)(cx+innerR*Math.cos(rad)), - (float)(cy+innerR*Math.sin(rad)), + (float)(cx+textR*Math.cos(rad)), + (float)(cy+textR*Math.sin(rad)), textPaint); } } -- cgit v1.2.3