From 3dd18d2a3bab34be28d303b6431480e77e6fd8f0 Mon Sep 17 00:00:00 2001
From: poire-z <poire-z@users.noreply.github.com>
Date: Fri, 18 Aug 2017 10:02:11 +0200
Subject: [PATCH] Fix "start with history" misalignment

due to a side effect with coverbrowser. CenterContainer is no
more needed as History is now full screen.
---
 .../apps/filemanager/filemanagerhistory.lua   | 19 +++++++------------
 frontend/ui/widget/menu.lua                   |  4 +++-
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/frontend/apps/filemanager/filemanagerhistory.lua b/frontend/apps/filemanager/filemanagerhistory.lua
index 904c09081..1d701ac47 100644
--- a/frontend/apps/filemanager/filemanagerhistory.lua
+++ b/frontend/apps/filemanager/filemanagerhistory.lua
@@ -1,5 +1,4 @@
 local ButtonDialog = require("ui/widget/buttondialog")
-local CenterContainer = require("ui/widget/container/centercontainer")
 local FileManagerBookInfo = require("apps/filemanager/filemanagerbookinfo")
 local Font = require("ui/font")
 local InputContainer = require("ui/widget/container/inputcontainer")
@@ -94,28 +93,24 @@ function FileManagerHistory:onMenuHold(item)
 end
 
 function FileManagerHistory:onShowHist()
-    local menu_container = CenterContainer:new{
-        dimen = Screen:getSize(),
-    }
-
     self.hist_menu = Menu:new{
         ui = self.ui,
         width = Screen:getWidth(),
         height = Screen:getHeight(),
         is_borderless = true,
-        show_parent = menu_container,
         onMenuHold = self.onMenuHold,
         _manager = self,
     }
     self:updateItemTable()
-
-    table.insert(menu_container, self.hist_menu)
-
     self.hist_menu.close_callback = function()
-        UIManager:close(menu_container)
+        -- Close it at next tick so it stays displayed
+        -- while a book is opening (avoids a transient
+        -- display of the underlying File Browser)
+        UIManager:nextTick(function()
+            UIManager:close(self.hist_menu)
+        end)
     end
-
-    UIManager:show(menu_container)
+    UIManager:show(self.hist_menu)
     return true
 end
 
diff --git a/frontend/ui/widget/menu.lua b/frontend/ui/widget/menu.lua
index 87014d43c..24f7f02cd 100644
--- a/frontend/ui/widget/menu.lua
+++ b/frontend/ui/widget/menu.lua
@@ -765,7 +765,9 @@ override this function to process the item selected in a different manner
 ]]--
 function Menu:onMenuSelect(item)
     if item.sub_item_table == nil then
-        self.close_callback()
+        if self.close_callback then
+            self.close_callback()
+        end
         self:onMenuChoice(item)
     else
         -- save menu title for later resume