fill mode option

assets/resources/application/en.xml

@@ -622,6 +622,16 @@
 				<node name="leather" value="Leather"/>
 				<node name="sepia" value="Sepia"/>
 				<node name="wood" value="Wood"/>
+				<node name="paper" value="Paper"/>
+				<node name="papirus" value="Papirus"/>
+			</node>
+			<node name="fillMode" value="Fill mode">
+				<node name="tile" value="Tile"/>
+				<node name="tileMirror" value="Mirrored tile"/>
+				<node name="fullscreen" value="Full screen"/>
+				<node name="stretch" value="Stretch to fill screen"/>
+				<node name="tileVertically" value="Stretch horizontally, tile vertically"/>
+				<node name="tileHorizontally" value="Stretch vertically, tile horizontally"/>
 			</node>
 			<node name="selectionBackground" value="Selection background"/>
 			<node name="selectionForeground" value="Selected text"/>

src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java

@@ -449,13 +449,27 @@ public class PreferenceActivity extends ZLPreferenceActivity {
 
 		final Screen colorsScreen = createPreferenceScreen("colors");
 
+		final PreferenceSet backgroundSet = new PreferenceSet.Enabler() {
+			@Override
+			protected Boolean detectState() {
+				return profile.WallpaperOption.getValue().startsWith("/");
+			}
+		};
 		myBackgroundPreference = new BackgroundPreference(
 			this,
 			profile,
 			colorsScreen.Resource.getResource("background"),
 			BACKGROUND_REQUEST_CODE
-		);
+		) {
+			@Override
+			public void update(Intent data) {
+				super.update(data);
+				backgroundSet.run();
+			}
+		};
 		colorsScreen.addPreference(myBackgroundPreference);
+		backgroundSet.add(colorsScreen.addOption(profile.FillModeOption, "fillMode"));
+		backgroundSet.run();
 
 		colorsScreen.addOption(profile.HighlightingOption, "highlighting");
 		colorsScreen.addOption(profile.RegularTextOption, "text");

src/org/geometerplus/fbreader/fbreader/FBView.java

@@ -405,10 +405,10 @@ public final class FBView extends ZLTextView {
 	}
 
 	@Override
-	public ZLPaintContext.WallpaperMode getWallpaperMode() {
+	public ZLPaintContext.FillMode getFillMode() {
 		return getWallpaperFile() instanceof ZLResourceFile
-			? ZLPaintContext.WallpaperMode.TILE_MIRROR
+			? ZLPaintContext.FillMode.tileMirror
-			: ZLPaintContext.WallpaperMode.TILE;
+			: myViewOptions.getColorProfile().FillModeOption.getValue();
 	}
 
 	@Override
@@ -497,7 +497,7 @@ public final class FBView extends ZLTextView {
 		public synchronized void paint(ZLPaintContext context) {
 			final ZLFile wallpaper = getWallpaperFile();
 			if (wallpaper != null) {
-				context.clear(wallpaper, getWallpaperMode());
+				context.clear(wallpaper, getFillMode());
 			} else {
 				context.clear(getBackgroundColor());
 			}

src/org/geometerplus/fbreader/fbreader/options/ColorProfile.java

@@ -23,6 +23,7 @@ import java.util.*;
 
 import org.geometerplus.zlibrary.core.util.ZLColor;
 import org.geometerplus.zlibrary.core.options.*;
+import org.geometerplus.zlibrary.core.view.ZLPaintContext;
 
 public class ColorProfile {
 	public static final String DAY = "defaultLight";
@@ -56,6 +57,7 @@ public class ColorProfile {
 	public final String Name;
 
 	public final ZLStringOption WallpaperOption;
+	public final ZLEnumOption<ZLPaintContext.FillMode> FillModeOption;
 	public final ZLColorOption BackgroundOption;
 	public final ZLColorOption SelectionBackgroundOption;
 	public final ZLColorOption SelectionForegroundOption;
@@ -67,6 +69,8 @@ public class ColorProfile {
 
 	private ColorProfile(String name, ColorProfile base) {
 		this(name);
+		WallpaperOption.setValue(base.WallpaperOption.getValue());
+		FillModeOption.setValue(base.FillModeOption.getValue());
 		BackgroundOption.setValue(base.BackgroundOption.getValue());
 		SelectionBackgroundOption.setValue(base.SelectionBackgroundOption.getValue());
 		SelectionForegroundOption.setValue(base.SelectionForegroundOption.getValue());
@@ -86,6 +90,8 @@ public class ColorProfile {
 		if (NIGHT.equals(name)) {
 			WallpaperOption =
 				new ZLStringOption("Colors", name + ":Wallpaper", "");
+			FillModeOption =
+				new ZLEnumOption<ZLPaintContext.FillMode>(name, "FillMode", ZLPaintContext.FillMode.tile);
 			BackgroundOption =
 				createOption(name, "Background", 0, 0, 0);
 			SelectionBackgroundOption =
@@ -105,6 +111,8 @@ public class ColorProfile {
 		} else {
 			WallpaperOption =
 				new ZLStringOption("Colors", name + ":Wallpaper", "wallpapers/sepia.jpg");
+			FillModeOption =
+				new ZLEnumOption<ZLPaintContext.FillMode>(name, "FillMode", ZLPaintContext.FillMode.tile);
 			BackgroundOption =
 				createOption(name, "Background", 255, 255, 255);
 			SelectionBackgroundOption =

src/org/geometerplus/zlibrary/core/view/DummyPaintContext.java

@@ -31,7 +31,7 @@ final class DummyPaintContext extends ZLPaintContext {
 	}
 
 	@Override
-	public void clear(ZLFile wallpaperFile, WallpaperMode mode) {
+	public void clear(ZLFile wallpaperFile, FillMode mode) {
 	}
 
 	@Override

src/org/geometerplus/zlibrary/core/view/ZLPaintContext.java

@@ -32,11 +32,16 @@ abstract public class ZLPaintContext {
 	protected ZLPaintContext() {
 	}
 
-	public static enum WallpaperMode {
+	public enum FillMode {
-		TILE,
+		tile,
-		TILE_MIRROR
+		tileMirror,
+		fullscreen,
+		stretch,
+		tileVertically,
+		tileHorizontally
 	}
-	abstract public void clear(ZLFile wallpaperFile, WallpaperMode mode);
+
+	abstract public void clear(ZLFile wallpaperFile, FillMode mode);
 	abstract public void clear(ZLColor color);
 	abstract public ZLColor getBackgroundColor();
 

src/org/geometerplus/zlibrary/text/view/ZLTextView.java

@@ -450,7 +450,7 @@ public abstract class ZLTextView extends ZLTextViewBase {
 		setContext(context);
 		final ZLFile wallpaper = getWallpaperFile();
 		if (wallpaper != null) {
-			context.clear(wallpaper, getWallpaperMode());
+			context.clear(wallpaper, getFillMode());
 		} else {
 			context.clear(getBackgroundColor());
 		}

src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java

@@ -85,7 +85,7 @@ abstract class ZLTextViewBase extends ZLView {
 	public abstract boolean twoColumnView();
 
 	public abstract ZLFile getWallpaperFile();
-	public abstract ZLPaintContext.WallpaperMode getWallpaperMode();
+	public abstract ZLPaintContext.FillMode getFillMode();
 	public abstract ZLColor getBackgroundColor();
 	public abstract ZLColor getSelectionBackgroundColor();
 	public abstract ZLColor getSelectionForegroundColor();

src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java

@@ -81,7 +81,7 @@ public final class ZLAndroidPaintContext extends ZLPaintContext {
 	private static ZLFile ourWallpaperFile;
 	private static Bitmap ourWallpaper;
 	@Override
-	public void clear(ZLFile wallpaperFile, WallpaperMode mode) {
+	public void clear(ZLFile wallpaperFile, FillMode mode) {
 		if (!wallpaperFile.equals(ourWallpaperFile)) {
 			ourWallpaperFile = wallpaperFile;
 			ourWallpaper = null;
@@ -89,7 +89,7 @@ public final class ZLAndroidPaintContext extends ZLPaintContext {
 				final Bitmap fileBitmap =
 					BitmapFactory.decodeStream(wallpaperFile.getInputStream());
 				switch (mode) {
-					case TILE_MIRROR:
+					case tileMirror:
 					{
 						final int w = fileBitmap.getWidth();
 						final int h = fileBitmap.getHeight();
@@ -111,7 +111,7 @@ public final class ZLAndroidPaintContext extends ZLPaintContext {
 						ourWallpaper = wallpaper;
 						break;
 					}
-					case TILE:
+					case tile:
 						ourWallpaper = fileBitmap;
 						break;
 				}
@@ -124,7 +124,7 @@ public final class ZLAndroidPaintContext extends ZLPaintContext {
 			final int w = ourWallpaper.getWidth();
 			final int h = ourWallpaper.getHeight();
 			for (int cw = 0, iw = 1; cw < myWidth; cw += w, ++iw) {
-				for (int ch = 0, ih = 1; ch < myHeight; ch += h, ++ih) {
+				for (int ch = 0, ih = 1; ch < myHeight + 100; ch += h, ++ih) {
 					myCanvas.drawBitmap(ourWallpaper, cw, ch, myFillPaint);
 				}
 			}
@@ -137,7 +137,7 @@ public final class ZLAndroidPaintContext extends ZLPaintContext {
 	public void clear(ZLColor color) {
 		myBackgroundColor = color;
 		myFillPaint.setColor(ZLAndroidColorUtil.rgb(color));
-		myCanvas.drawRect(0, 0, myWidth + myScrollbarWidth, myHeight, myFillPaint);
+		myCanvas.drawRect(0, 0, myWidth + myScrollbarWidth, myHeight + 100, myFillPaint);
 	}
 
 	@Override