yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 10:49:24 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 3d

Browse source
This commit is contained in:
Nikolay Pultsin 2011-01-22 23:15:22 +00:00
commit 9530e55f77
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/org/geometerplus/zlibrary/core/options/ZLEnumOption.java
View file

@ -33,7 +33,10 @@ public final class ZLEnumOption<T extends Enum<T>> extends ZLOption {
if (!myIsSynchronized) { if (!myIsSynchronized) {
final String value = getConfigValue(null); final String value = getConfigValue(null);
if (value != null) { if (value != null) {
myValue = (T)T.valueOf(myDefaultValue.getClass(), value); try {
myValue = (T)T.valueOf(myDefaultValue.getClass(), value);
} catch (Throwable t) {
}
} }
myIsSynchronized = true; myIsSynchronized = true;
} }

12
src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java
View file

@ -178,11 +178,13 @@ public class ZLAndroidWidget extends View implements View.OnLongClickListener {
shift += size; shift += size;
} }
// TODO: set color // TODO: set color
myPaint.setColor(Color.rgb(127, 127, 127)); if (shift > 0 && shift < size) {
if (horizontal) { myPaint.setColor(Color.rgb(127, 127, 127));
canvas.drawLine(shift, 0, shift, h + 1, myPaint); if (horizontal) {
} else { canvas.drawLine(shift, 0, shift, h + 1, myPaint);
canvas.drawLine(0, shift, w + 1, shift, myPaint); } else {
canvas.drawLine(0, shift, w + 1, shift, myPaint);
}
} }
break; break;
case paper3d: case paper3d: