提交 637b45a0 编写于 作者: H huangziwei

选中DoodlePath时显示编辑菜单

上级 69ce9988
......@@ -257,8 +257,11 @@ public class DoodleActivity extends Activity {
}
}
mPaintSizeBar.setProgress((int) (selectableItem.getSize() + 0.5f));
mSelectedTextEditContainer.setVisibility(View.VISIBLE);
if (doodle.getPen() == DoodlePen.TEXT || doodle.getPen() == DoodlePen.BITMAP) {
mSelectedTextEditContainer.setVisibility(View.VISIBLE);
findViewById(R.id.doodle_selectable_edit).setVisibility(View.VISIBLE);
} else {
findViewById(R.id.doodle_selectable_edit).setVisibility(View.GONE);
}
} else {
DoodleColor color = null;
......
......@@ -139,7 +139,7 @@ public class DoodlePath extends DoodleSelectableItemBase {
if (mPath != null) {
int diff = (int) (getSize() / 2);
mPath.computeBounds(mBound, false);
if (getShape() == DoodleShape.ARROW) {
if (getShape() == DoodleShape.ARROW || getShape() == DoodleShape.FILL_CIRCLE || getShape() == DoodleShape.FILL_RECT) {
diff = (int) getDoodle().getUnitSize();
}
rect.set((int) (mBound.left - diff), (int) (mBound.top - diff), (int) (mBound.right + diff), (int) (mBound.bottom + diff));
......
......@@ -21,8 +21,7 @@ public enum DoodleShape implements IDoodleShape {
@Override
public void draw(Canvas canvas, IDoodleItem doodleItem, Paint paint) {
if (doodleItem.getShape() == DoodleShape.ARROW) {
paint.setStrokeWidth(doodleItem.getDoodle().getUnitSize());
if (doodleItem.getShape() == DoodleShape.ARROW || doodleItem.getShape() == DoodleShape.FILL_CIRCLE || doodleItem.getShape() == DoodleShape.FILL_RECT) {
paint.setStyle(Paint.Style.FILL);
}
DoodlePath doodlePath = (DoodlePath) doodleItem;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册