From 8207b6935b4e35796e5e10e4df5d382c4e618c25 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Tue, 18 Mar 2014 02:48:45 +0200 Subject: [PATCH] video element size --- src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java b/src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java index cd136fad7..5a12ca18d 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java @@ -198,7 +198,7 @@ abstract class ZLTextViewBase extends ZLView { ); return size != null ? size.Width : 0; } else if (element instanceof ZLTextVideoElement) { - return 300; + return Math.min(300, getTextColumnWidth()); } else if (element == ZLTextElement.Indent) { return myTextStyle.getFirstLineIndentDelta(); } else if (element instanceof ZLTextFixedHSpaceElement) { @@ -220,7 +220,7 @@ abstract class ZLTextViewBase extends ZLView { return (size != null ? size.Height : 0) + Math.max(getContext().getStringHeight() * (myTextStyle.getLineSpacePercent() - 100) / 100, 3); } else if (element instanceof ZLTextVideoElement) { - return 200; + return Math.min(Math.min(200, getTextAreaHeight()), getTextColumnWidth() * 2 / 3); } return 0; }