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

line spacing option

Browse source
This commit is contained in:
Nikolay Pultsin 2014-06-07 06:20:10 +01:00
parent 543f19d4a0
commit 0a90ed38cd
37 changed files with 68 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
View file

@ -254,24 +254,6 @@ public class PreferenceActivity extends ZLPreferenceActivity {
textScreen.addOption(baseStyle.AutoHyphenationOption, "autoHyphenations");
final Screen moreStylesScreen = textScreen.createPreferenceScreen("more");
/*
final ZLIntegerOption spacePercentOption = decoration.LineSpacePercentOption;
final int[] spacingValues = new int[17];
final String[] spacingKeys = new String[17];
spacingValues[0] = -1;
spacingKeys[0] = "unchanged";
for (int j = 1; j < spacingValues.length; ++j) {
final int val = 4 + j;
spacingValues[j] = 10 * val;
spacingKeys[j] = (char)(val / 10 + '0') + decimalSeparator + (char)(val % 10 + '0');
}
formatScreen.addPreference(new ZLIntegerChoicePreference(
this, textScreen.Resource, "lineSpacing",
spacePercentOption, spacingValues, spacingKeys
));
*/
for (ZLTextNGStyleDescription description : collection.getDescriptionList()) {
final Screen ngScreen = moreStylesScreen.createPreferenceScreen(description.Name);
ngScreen.addPreference(new FontPreference(
@ -308,6 +290,11 @@ public class PreferenceActivity extends ZLPreferenceActivity {
description.AlignmentOption,
new String[] { "inherit", "left", "right", "center", "justify" }
));
ngScreen.addPreference(new StringPreference(
this, description.LineHeightOption,
StringPreference.Constraint.PERCENT,
textScreen.Resource, "lineSpacing"
));
ngScreen.addPreference(new StringPreference(
this, description.MarginTopOption,
StringPreference.Constraint.LENGTH,