Refactor: move some menu-creation functions to MenuCreator

Another patch to trim down the code that needs to be part of BScreen

1 files changed, 11 insertions, 7 deletions

diff --git a/src/MenuCreator.cc b/src/MenuCreator.cc
index b2b15f5..e8fb90b 100644
--- a/src/MenuCreator.cc
+++ b/src/MenuCreator.cc
@@ -482,20 +482,24 @@ bool getStart(FbMenuParser &parser, string &label, FbTk::StringConvertor &labelc
 
 } // end of anonymous namespace
 
-FbMenu *MenuCreator::createMenu(const string &label, int screen_number) {
-    BScreen *screen = Fluxbox::instance()->findScreen(screen_number);
-    if (screen == 0)
-        return 0;
 
-    FbMenu *menu = new FbMenu(screen->menuTheme(),
-                                  screen->imageControl(),
-                                  *screen->layerManager().getLayer(ResourceLayer::MENU));
+
+FbMenu* MenuCreator::createMenu(const std::string& label, BScreen& screen) {
+    FbTk::Layer* layer = screen.layerManager().getLayer(ResourceLayer::MENU);
+    FbMenu *menu = new FbMenu(screen.menuTheme(), screen.imageControl(), *layer);
     if (!label.empty())
         menu->setLabel(label);
 
     return menu;
 }
 
+FbMenu *MenuCreator::createMenu(const string &label, int screen_number) {
+    BScreen *screen = Fluxbox::instance()->findScreen(screen_number);
+    if (screen == 0)
+        return 0;
+    return MenuCreator::createMenu(label, *screen);
+}
+
 bool MenuCreator::createFromFile(const string &filename,
                                  FbTk::Menu &inject_into,
                                  AutoReloadHelper *reloader, bool begin) {