From 864c1c31a32a7388eb7f0c5e92606903aa1f19c3 Mon Sep 17 00:00:00 2001 From: Kazhnuz Date: Wed, 13 Feb 2019 19:07:44 +0100 Subject: [PATCH] core/menusystem: fix widget size in gridbox --- sonic-boost.love/core/modules/menusystem/grid.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sonic-boost.love/core/modules/menusystem/grid.lua b/sonic-boost.love/core/modules/menusystem/grid.lua index e135d60..e0657c6 100644 --- a/sonic-boost.love/core/modules/menusystem/grid.lua +++ b/sonic-boost.love/core/modules/menusystem/grid.lua @@ -5,13 +5,13 @@ local GridBox = Menu:extend() function GridBox:new(menusystem, name, x, y, w, h, colNumber, lineNumber) self.view = {} - self.view.slotNumber = colNumber * lineNumber - self.view.colNumber = colNumber - self.view.colNumber = lineNumber + self.view.slotNumber = colNumber * lineNumber + self.view.colNumber = colNumber + self.view.lineNumber = lineNumber GridBox.super.new(self, menusystem, name, x, y, w, h) self.begin = 1 self.h = lineNumber * self.widget.h -- On fait en sorte que la hauteur - self.w = colNumber * self.widget.w -- et la largeur + self.w = colNumber * self.widget.w -- et la largeur -- soit un multiple du nombre de slot et de leur dimensions self.cursor = {} self.cursor.x = 0 @@ -30,13 +30,13 @@ function GridBox:new(menusystem, name, x, y, w, h, colNumber, lineNumber) end function GridBox:updateWidgetSize() - self.widget.h = math.floor( self.h / self.view.colNumber ) + self.widget.h = math.floor( self.h / self.view.lineNumber ) self.widget.w = math.floor( self.w / self.view.colNumber ) end function GridBox:getWidgetSize(id) local slot = self:getWidgetSlot(id) - return self.slots[slot].width, self.slots[slot].height + return self.widget.w * self.slots[slot].width, self.widget.h * self.slots[slot].height end function GridBox:getWidgetSlot(widgetID)