zeros + degree symbol
This commit is contained in:
parent
b6ea33dadd
commit
9beac92c67
@ -9,7 +9,7 @@
|
|||||||
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
|
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
|
||||||
a:id="@+id/plusButton"
|
a:id="@+id/plusButton"
|
||||||
calc:directionTextScale="0.5"
|
calc:directionTextScale="0.5"
|
||||||
|
calc:textUp="°"
|
||||||
a:text="+"
|
a:text="+"
|
||||||
style="?digitButtonStyle"
|
style="?digitButtonStyle"
|
||||||
a:onClick="digitButtonClickHandler"/>
|
a:onClick="digitButtonClickHandler"/>
|
@ -10,8 +10,7 @@
|
|||||||
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
|
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
|
||||||
a:id="@+id/zeroDigitButton" a:text="0"
|
a:id="@+id/zeroDigitButton" a:text="0"
|
||||||
calc:textUp="."
|
calc:textUp="."
|
||||||
calc:textDown=","
|
calc:textDown="000"
|
||||||
calc:directionTextScale="0.5"
|
calc:directionTextScale="0.5"
|
||||||
|
|
||||||
style="?digitButtonStyle"
|
style="?digitButtonStyle"
|
||||||
a:onClick="digitButtonClickHandler"/>
|
a:onClick="digitButtonClickHandler"/>
|
@ -116,13 +116,13 @@ public class DirectionDragButton extends DragButton {
|
|||||||
textDownPosition = getTextPosition(upDownTextPaint, basePaint, textDown, getText(), -1, getWidth(), getHeight(), getDirectionTextScale());
|
textDownPosition = getTextPosition(upDownTextPaint, basePaint, textDown, getText(), -1, getWidth(), getHeight(), getDirectionTextScale());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (textDownPosition != null && textUpPosition != null) {
|
/*if (textDownPosition != null && textUpPosition != null) {
|
||||||
if (textDownPosition.getX() > textUpPosition.getX()) {
|
if (textDownPosition.getX() > textUpPosition.getX()) {
|
||||||
textDownPosition.setX(textUpPosition.getX());
|
textDownPosition.setX(textUpPosition.getX());
|
||||||
} else {
|
} else {
|
||||||
textUpPosition.setX(textDownPosition.getX());
|
textUpPosition.setX(textDownPosition.getX());
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user