Version 2.2 - retro layout + bug fixes

modules/game_interface/gameinterface.lua

@@ -553,9 +553,9 @@ function createThingMenu(menuPosition, lookThing, useThing, creatureThing)
   if g_game.getFeature(GameBot) and useThing and useThing:isItem() then
     menu:addSeparator()
     if useThing:getSubType() > 1 then
-      menu:addOption("ID: " .. useThing:getId() .. " SubType: " .. useThing:getSubType())    
+      menu:addOption("ID: " .. useThing:getId() .. " SubType: " .. useThing:getSubType(), function() end)    
     else
-      menu:addOption("ID: " .. useThing:getId())
+      menu:addOption("ID: " .. useThing:getId(), function() end)
     end
   end
 
@@ -877,7 +877,9 @@ function refreshViewMode()
   
   if classic then  
     g_game.changeMapAwareRange(19, 15)
-    gameRootPanel:addAnchor(AnchorTop, 'topMenu', AnchorBottom)
+    if not modules.client_topmenu.getTopMenu().hideIngame then
+      gameRootPanel:addAnchor(AnchorTop, 'topMenu', AnchorBottom)
+    end
     gameMapPanel:addAnchor(AnchorLeft, 'gameLeftPanels', AnchorRight)
     gameMapPanel:addAnchor(AnchorRight, 'gameRightPanels', AnchorLeft)
     gameMapPanel:addAnchor(AnchorBottom, 'gameBottomPanel', AnchorTop)    
@@ -943,6 +945,9 @@ function updateSize()
       maxWidth = tileSize * (awareRange.width - 1)
     end
     gameMapPanel:setMarginTop(-tileSize)
+    if modules.game_stats then
+      modules.game_stats.ui:setMarginTop(tileSize)
+    end
     if g_settings.getBoolean("cacheMap") then
       gameMapPanel:setMarginLeft(0)
       gameMapPanel:setMarginRight(0)    
@@ -958,7 +963,11 @@ function updateSize()
           child.onGeometryChange(child)
         end
       end
-    end    
+    end
+  else
+    if modules.game_stats then
+      modules.game_stats.ui:setMarginTop(0)
+    end  
   end
   
     --[[

modules/game_interface/gameinterface.otui

@@ -23,7 +23,6 @@ GameMapPanel < UIGameMap
 UIWidget
   id: gameRootPanel
   anchors.fill: parent
-  anchors.top: topMenu.bottom
   
   GameMapPanel
     id: gameMapPanel
@@ -77,4 +76,3 @@ UIWidget
     id: mouseGrabber
     focusable: false
     visible: false
-

modules/game_interface/interface.otmod

@@ -6,6 +6,7 @@ Module
   sandboxed: true
   scripts: [ widgets/uigamemap, gameinterface ]
   load-later:
+    - game_buttons
     - game_hotkeys
     - game_questlog
     - game_textmessage
@@ -37,6 +38,7 @@ Module
     - game_actionbar
     - game_prey
     - game_imbuing
+    - game_stats
     - game_bot
   @onLoad: init()
   @onUnload: terminate()