TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zeros + degree symbol

Browse Source
This commit is contained in:
serso 2011-10-23 14:23:18 +04:00
parent d3f342f7a4
commit 1222bed9bd
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/calc_plus_button.xml
View File

@ -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"/>

3
res/layout/calc_zero_digit_button.xml
View File

@ -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"/>

4
src/main/java/org/solovyev/android/view/widgets/DirectionDragButton.java
View File

@ -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());
} }
} }*/
} }