Merge pull request #599 from nicolua/master

menu on k3

frontend/apps/reader/modules/readerfont.lua

@@ -121,7 +121,11 @@ function ReaderFont:onShowFontMenu()
         UIManager:close(menu_container)
     end
     -- show menu
+
+    main_menu.show_parent = menu_container
+
     UIManager:show(menu_container)
+
     return true
 end
 

frontend/apps/reader/modules/readertoc.lua

@@ -124,7 +124,6 @@ function ReaderToc:onShowToc()
         ui = self.ui,
         width = Screen:getWidth(),
         height = Screen:getHeight(),
-        show_parent = menu_container,
         is_borderless = true,
     }
 
@@ -141,7 +140,10 @@ function ReaderToc:onShowToc()
         UIManager:close(menu_container)
     end
 
+    toc_menu.show_parent = menu_container
+
     UIManager:show(menu_container)
+
     return true
 end
 

frontend/ui/widget/focusmanager.lua

@@ -80,7 +80,7 @@ function FocusManager:onFocusMove(args)
             current_item:handleEvent(Event:new("Unfocus"))
             self.layout[self.selected.y][self.selected.x]:handleEvent(Event:new("Focus"))
             -- trigger a repaint (we need to be the registered widget!)
-            UIManager:setDirty(self, "partial")
+            UIManager:setDirty(self.show_parent or self, "partial")
             break
         end
     end

frontend/ui/widget/menu.lua

@@ -542,8 +542,11 @@ function Menu:updateItems(select_number)
     end
 
     -- FIXME: this is a dirty hack to clear previous menus
-    UIManager.repaint_all = true
+--    UIManager.repaint_all = true
     --UIManager:setDirty(self)
+--nicolua
+    UIManager:setDirty(self.show_parent or self)
+
 end
 
 function Menu:swithItemTable(new_title, new_item_table)