Merge pull request #422 from chrox/master

invert color when selecting bookmark

defaults.lua

@@ -82,9 +82,9 @@ DCREREADER_CONFIG_FONT_SIZES = {16, 20, 22, 24, 28, 32, 38, 44}  -- range from 1
 
 -- crereader margin sizes
 -- margin {left, top, right, bottom} in pixels
-DCREREADER_CONFIG_MARGIN_SIZES_SMALL = {3, 5, 0, 5}
-DCREREADER_CONFIG_MARGIN_SIZES_MEDIUM = {6, 10, 2, 10}
-DCREREADER_CONFIG_MARGIN_SIZES_LARGE = {15, 10, 10, 10}
+DCREREADER_CONFIG_MARGIN_SIZES_SMALL = {6, 5, 2, 5}
+DCREREADER_CONFIG_MARGIN_SIZES_MEDIUM = {15, 10, 10, 10}
+DCREREADER_CONFIG_MARGIN_SIZES_LARGE = {25, 10, 20, 10}
 
 -- gesture detector defaults
 DGESDETECT_DISABLE_DOUBLE_TAP = true

frontend/document/pdfdocument.lua

@@ -115,6 +115,7 @@ end
 function PdfDocument:register(registry)
 	registry:addProvider("pdf", "application/pdf", self)
 	registry:addProvider("cbz", "application/cbz", self)
+	registry:addProvider("xps", "application/xps", self)
 end
 
 return PdfDocument

frontend/ui/reader/readerbookmark.lua

@@ -73,13 +73,21 @@ function ReaderBookmark:onShowBookmark()
 		end
 		v.text = "Page "..page.." "..v.notes.." @ "..v.datetime
 	end
+	
+	local menu_container = CenterContainer:new{
+		dimen = Screen:getSize(),
+	}
 
 	local bm_menu = Menu:new{
 		title = "Bookmarks",
 		item_table = self.bookmarks,
 		width = Screen:getWidth()-50,
 		height = Screen:getHeight()-50,
+		show_parent = menu_container,
 	}
+	
+	table.insert(menu_container, bm_menu)
+	
 	-- buid up menu widget method as closure
 	local doc = self.ui.document
 	local view = self.view
@@ -96,10 +104,6 @@ function ReaderBookmark:onShowBookmark()
 		end
 	end
 
-	local menu_container = CenterContainer:new{
-		dimen = Screen:getSize(),
-		bm_menu,
-	}
 	bm_menu.close_callback = function()
 		UIManager:close(menu_container)
 	end