Moved title bar margin option into "Footnotes" submenu.

Moved header rect modification from function LVDocView::drawPageTo() to LVDocView::getPageHeaderRectangle(), to excude text intersection(imposition) in title bar.

Author: virxkane

android/res/values-ru/strings.xml

@@ -89,7 +89,7 @@
     <string name="options_page_margin_right">Правый отступ</string>
     <string name="options_page_margin_top">Верхний отступ</string>
     <string name="options_page_margin_bottom">Нижний отступ</string>
-    <string name="options_rounded_corners_margin">Отступы в заголовке (для скругленных краев)</string>
+    <string name="options_rounded_corners_margin">Отступ (для устройств со скругленными углами)</string>
     <string name="options_view_mode">Режим просмотра</string>
     <string name="options_view_mode_pages">Страницы</string>
     <string name="options_view_mode_scroll">Свиток</string>

android/res/values/strings.xml

@@ -94,7 +94,7 @@
     <string name="options_page_margin_right">Right margin</string>
     <string name="options_page_margin_top">Top margin</string>
     <string name="options_page_margin_bottom">Bottom margin</string>
-    <string name="options_rounded_corners_margin">Header margins (for rounded corners)</string>
+    <string name="options_rounded_corners_margin">Margin (for devices with rounded corners)</string>
     <string name="options_view_mode">View mode</string>
     <string name="options_view_mode_pages">Pages</string>
     <string name="options_view_mode_scroll">Scroll</string>

android/src/org/coolreader/crengine/OptionsDialog.java

@@ -759,6 +759,7 @@ public void onSelect() {
 			BaseDialog dlg = new BaseDialog(mActivity, label, false, false);
 			OptionsListView listView = new OptionsListView(getContext());
 			listView.add(new ListOption(mOwner, getString(R.string.options_page_show_titlebar), PROP_STATUS_LOCATION).add(mStatusPositions, mStatusPositionsTitles).setDefaultValue("1"));
+			listView.add(new ListOption(mOwner, getString(R.string.options_rounded_corners_margin), PROP_ROUNDED_CORNERS_MARGIN).add(mRoundedCornersMargins).setDefaultValue("0"));
 			listView.add(new ListOption(mOwner, getString(R.string.options_page_titlebar_font_face), PROP_STATUS_FONT_FACE).add(mFontFaces).setDefaultValue(mFontFaces[0]).setIconIdByAttr(R.attr.cr3_option_font_face_drawable, R.drawable.cr3_option_font_face));
 			listView.add(new ListOption(mOwner, getString(R.string.options_page_titlebar_font_size), PROP_STATUS_FONT_SIZE).add(filterFontSizes(mStatusFontSizes)).setDefaultValue("18").setIconIdByAttr(R.attr.cr3_option_font_size_drawable, R.drawable.cr3_option_font_size));
 			listView.add(new ColorOption(mOwner, getString(R.string.options_page_titlebar_font_color), PROP_STATUS_FONT_COLOR, 0x000000));
@@ -1955,7 +1956,6 @@ private void setupReaderOptions()
 		mOptionsPage.add(new ListOption(this, getString(R.string.options_page_margin_right), PROP_PAGE_MARGIN_RIGHT).add(mMargins).setDefaultValue("5").setIconIdByAttr(R.attr.cr3_option_text_margin_right_drawable, R.drawable.cr3_option_text_margin_right));
 		mOptionsPage.add(new ListOption(this, getString(R.string.options_page_margin_top), PROP_PAGE_MARGIN_TOP).add(mMargins).setDefaultValue("5").setIconIdByAttr(R.attr.cr3_option_text_margin_top_drawable, R.drawable.cr3_option_text_margin_top));
 		mOptionsPage.add(new ListOption(this, getString(R.string.options_page_margin_bottom), PROP_PAGE_MARGIN_BOTTOM).add(mMargins).setDefaultValue("5").setIconIdByAttr(R.attr.cr3_option_text_margin_bottom_drawable, R.drawable.cr3_option_text_margin_bottom));
-		mOptionsPage.add(new ListOption(this, getString(R.string.options_rounded_corners_margin), PROP_ROUNDED_CORNERS_MARGIN).add(mRoundedCornersMargins).setDefaultValue("0"));
 
 		mOptionsControls = new OptionsListView(getContext());
 		mOptionsControls.add(new KeyMapOption(this, getString(R.string.options_app_key_actions)).setIconIdByAttr(R.attr.cr3_option_controls_keys_drawable, R.drawable.cr3_option_controls_keys));

crengine/src/lvdocview.cpp

@@ -1245,10 +1245,11 @@ void LVDocView::getPageHeaderRectangle(int pageIndex, lvRect & headerRc) {
 		headerRc.bottom = 0;
 	} else {
 		int h = getPageHeaderHeight();
+		int propHeaderMargin = m_props->getIntDef(PROP_ROUNDED_CORNERS_MARGIN, 0);
 		headerRc.bottom = headerRc.top + h;
 		headerRc.top += HEADER_MARGIN;
-		headerRc.left += HEADER_MARGIN;
-		headerRc.right -= HEADER_MARGIN;
+		headerRc.left += HEADER_MARGIN + propHeaderMargin;
+		headerRc.right -= HEADER_MARGIN + propHeaderMargin;
 	}
 }
 
@@ -1603,9 +1604,6 @@ void LVDocView::drawPageHeader(LVDrawBuf * drawbuf, const lvRect & headerRc,
 	drawbuf->SetClipRect(&hrc);
 	bool drawGauge = true;
 	lvRect info = headerRc;
-	info.left = info.left + m_props->getIntDef(PROP_ROUNDED_CORNERS_MARGIN, 0);
-	info.right = info.right - m_props->getIntDef(PROP_ROUNDED_CORNERS_MARGIN, 0);;
-
 //    if ( m_statusColor!=0xFF000000 ) {
 //        CRLog::trace("Status color = %06x, textColor=%06x", m_statusColor, getTextColor());
 //    } else {