From c8de4f3f6c46fb1a175acf47176536b558fd8a7d Mon Sep 17 00:00:00 2001
From: Qingping Hou <dave2008713@gmail.com>
Date: Sun, 9 Dec 2012 01:25:32 +0800
Subject: [PATCH] adapt filechooser and readermenu to new menu widget

* now if you want to center a menu, you have to wrap it
in CenterContainer. Refer to readermenu for details.
---
 frontend/ui/filechooser.lua       |  2 ++
 frontend/ui/reader/readermenu.lua | 24 +++++++++++++++++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/frontend/ui/filechooser.lua b/frontend/ui/filechooser.lua
index 2ab853bb7..dbfbf044f 100644
--- a/frontend/ui/filechooser.lua
+++ b/frontend/ui/filechooser.lua
@@ -1,6 +1,8 @@
 require "ui/menu"
 
 FileChooser = Menu:new{
+	height = Screen:getHeight(),
+	width = Screen:getWidth(),
 	path = ".",
 	parent = nil,
 	show_hidden = false,
diff --git a/frontend/ui/reader/readermenu.lua b/frontend/ui/reader/readermenu.lua
index ecfae4130..d19c55f83 100644
--- a/frontend/ui/reader/readermenu.lua
+++ b/frontend/ui/reader/readermenu.lua
@@ -12,7 +12,7 @@ function ReaderMenu:init()
 						h = Screen:getHeight()/2
 					}
 				}
-			}
+			},
 		}
 	else
 		self.key_events = {
@@ -94,6 +94,7 @@ function ReaderMenu:onShowMenu()
 	table.insert(item_table, {
 		text = "Return to file browser",
 		callback = function()
+			UIManager:close(self.menu_container)
 			self.ui:onClose()
 		end
 	})
@@ -101,17 +102,25 @@ function ReaderMenu:onShowMenu()
 	local main_menu = Menu:new{
 		title = "Document menu",
 		item_table = item_table,
-		width = 300,
-		height = #item_table + 3 * 28
+		width = Screen:getWidth() - 100,
 	}
-
 	function main_menu:onMenuChoice(item)
 		if item.callback then
 			item.callback()
 		end
 	end
 
-	UIManager:show(main_menu)
+	local menu_container = CenterContainer:new{
+		main_menu,
+		dimen = Screen:getSize(),
+	}
+	main_menu.close_callback = function () 
+		UIManager:close(menu_container)
+	end
+	-- maintain a reference to menu_container
+	self.menu_container = menu_container
+
+	UIManager:show(menu_container)
 
 	return true
 end
@@ -121,3 +130,8 @@ function ReaderMenu:onTapShowMenu()
 	return true
 end
 
+function ReaderMenu:onSetDimensions(dimen)
+	-- update gesture listenning range according to new screen orientation
+	self:init()
+end
+