diff --git a/src/org/geometerplus/android/fbreader/DisplayBookPopupAction.java b/src/org/geometerplus/android/fbreader/DisplayBookPopupAction.java index d1685a3f4..17cef27bb 100644 --- a/src/org/geometerplus/android/fbreader/DisplayBookPopupAction.java +++ b/src/org/geometerplus/android/fbreader/DisplayBookPopupAction.java @@ -19,11 +19,16 @@ package org.geometerplus.android.fbreader; +import android.util.TypedValue; +import android.view.Gravity; import android.view.View; import android.widget.PopupWindow; import android.widget.*; +import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.text.view.*; +import org.geometerplus.zlibrary.ui.android.R; +import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageData; import org.geometerplus.fbreader.fbreader.FBReaderApp; @@ -59,7 +64,15 @@ class DisplayBookPopupAction extends FBAndroidAction { popup.setFocusable(true); popup.setOutsideTouchable(true); - final ZLResource buttonResource = ZLResource.resource("dialog").getResource("button") + final ImageView coverView = (ImageView)bookView.findViewById(R.id.book_popup_cover); + if (coverView != null) { + final ZLAndroidImageData imageData = (ZLAndroidImageData)element.getImageData(); + if (imageData != null) { + coverView.setImageBitmap(imageData.getFullSizeBitmap()); + } + } + + final ZLResource buttonResource = ZLResource.resource("dialog").getResource("button"); final View buttonsView = bookView.findViewById(R.id.book_popup_buttons); final Button downloadButton = (Button)buttonsView.findViewById(R.id.ok_button); diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextView.java b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java index 79db788a8..1f136b02b 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextView.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java @@ -946,6 +946,16 @@ public abstract class ZLTextView extends ZLTextViewBase { final int hMargin = ZLibrary.Instance().getDisplayDPI() / 10; final ZLImageData imageData = ((BookElement)element).getImageData(); if (imageData != null) { + context.drawImage( + area.XStart + hMargin, area.YEnd - vMargin, + imageData, + new ZLPaintContext.Size( + area.XEnd - area.XStart - 2 * hMargin + 1, + area.YEnd - area.YStart - 2 * vMargin + 1 + ), + ZLPaintContext.ScalingType.FitMaximum, + ZLPaintContext.ColorAdjustingMode.NONE + ); } else { } } else if (element == ZLTextElement.HSpace) {