Merge pull request #50 from virxkane/plotn-rounded-corners

Plotn rounded corners

Author: buggins

android/res/values-ru/strings.xml

@@ -89,6 +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_view_mode">Режим просмотра</string>
     <string name="options_view_mode_pages">Страницы</string>
     <string name="options_view_mode_scroll">Свиток</string>

android/res/values/strings.xml

@@ -94,6 +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">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/BaseActivity.java

@@ -1718,6 +1718,7 @@ public Properties loadSettings(BaseActivity activity, File file) {
 			props.applyDefault(ReaderView.PROP_PAGE_MARGIN_RIGHT, hmargin);
 			props.applyDefault(ReaderView.PROP_PAGE_MARGIN_TOP, vmargin);
 			props.applyDefault(ReaderView.PROP_PAGE_MARGIN_BOTTOM, vmargin);
+			props.applyDefault(ReaderView.PROP_ROUNDED_CORNERS_MARGIN, "0");
 
 	        props.applyDefault(ReaderView.PROP_APP_SCREEN_UPDATE_MODE, "0");
 	        props.applyDefault(ReaderView.PROP_APP_SCREEN_UPDATE_INTERVAL, "10");

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

@@ -103,6 +103,9 @@ public static int findBacklightSettingIndex( int value ) {
 	int[] mMargins = new int[] {
 			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 15, 20, 25, 30, 40, 50, 60, 80, 100, 130, 150, 200, 300
 		};
+	int[] mRoundedCornersMargins = new int[] {
+			0, 5, 10, 15, 20, 30, 40, 50, 60, 70,80, 90, 100, 120, 140, 160
+	};
 	double[] mGammas = new double[] {
 			0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.1, 1.2, 1.3, 1.5, 1.9
 		};
@@ -756,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));
@@ -1952,7 +1956,7 @@ 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));
-		
+
 		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));
 		mOptionsControls.add(new TapZoneOption(this, getString(R.string.options_app_tapzones_normal), PROP_APP_TAP_ZONE_ACTIONS_TAP).setIconIdByAttr(R.attr.cr3_option_controls_tapzones_drawable, R.drawable.cr3_option_controls_tapzones));

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

@@ -41,6 +41,7 @@ public interface Settings {
     public static final String PROP_PAGE_MARGIN_BOTTOM      ="crengine.page.margin.bottom";
     public static final String PROP_PAGE_MARGIN_LEFT        ="crengine.page.margin.left";
     public static final String PROP_PAGE_MARGIN_RIGHT       ="crengine.page.margin.right";
+    public static final String PROP_ROUNDED_CORNERS_MARGIN  ="crengine.rounded.corners.margin";
     public static final String PROP_PAGE_VIEW_MODE          ="crengine.page.view.mode"; // pages/scroll
     public static final String PROP_PAGE_ANIMATION          ="crengine.page.animation";
     public static final String PROP_INTERLINE_SPACE         ="crengine.interline.space";

crengine/include/lvdocviewprops.h

@@ -24,6 +24,7 @@
 #define PROP_PAGE_MARGIN_BOTTOM      "crengine.page.margin.bottom"
 #define PROP_PAGE_MARGIN_LEFT        "crengine.page.margin.left"
 #define PROP_PAGE_MARGIN_RIGHT       "crengine.page.margin.right"
+#define PROP_ROUNDED_CORNERS_MARGIN  "crengine.rounded.corners.margin"
 #define PROP_PAGE_VIEW_MODE          "crengine.page.view.mode" // pages/scroll
 #define PROP_INTERLINE_SPACE         "crengine.interline.space"
 #if CR_INTERNAL_PAGE_ORIENTATION==1

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;
 	}
 }
 
@@ -5698,7 +5699,10 @@ void LVDocView::propsUpdateDefaults(CRPropRef props) {
 	props->limitValueList(PROP_PAGE_MARGIN_BOTTOM, def_margin, sizeof(def_margin)/sizeof(int));
 	props->limitValueList(PROP_PAGE_MARGIN_LEFT, def_margin, sizeof(def_margin)/sizeof(int));
 	props->limitValueList(PROP_PAGE_MARGIN_RIGHT, def_margin, sizeof(def_margin)/sizeof(int));
-	static int def_updates[] = { 1, 0, 2, 3, 4, 5, 6, 7, 8, 10, 14 };
+    static int def_rounded_corners_margin[] = {0, 5, 10, 15, 20, 30, 40, 50, 60, 70,80, 90, 100, 120, 140, 160};
+    props->limitValueList(PROP_ROUNDED_CORNERS_MARGIN, def_rounded_corners_margin, sizeof(def_rounded_corners_margin)/sizeof(int));
+
+    static int def_updates[] = { 1, 0, 2, 3, 4, 5, 6, 7, 8, 10, 14 };
 	props->limitValueList(PROP_DISPLAY_FULL_UPDATE_INTERVAL, def_updates, 11);
 	int fs = props->getIntDef(PROP_STATUS_FONT_SIZE, INFO_FONT_SIZE);
     if (fs < MIN_STATUS_FONT_SIZE)