Updates

DiesalGUI-2.0/DiesalGUI-2.0.lua

@@ -58,7 +58,8 @@ DiesalGUI.Scaling = {
     screenHeight = 0,
     originalHeight = DUIParent:GetHeight(),
     resolution = "0x0",
-    perfect = 0
+    perfect = 0,
+    uiscale = UIParent:GetScale()
 }
 
 DiesalGUI.Scaling.physicalWidth, DiesalGUI.Scaling.physicalHeight = GetPhysicalScreenSize()
@@ -69,10 +70,10 @@ DiesalGUI.Scaling.perfect = 768 / DiesalGUI.Scaling.physicalWidth
 function DiesalGUI:UIScale()
     local D = self
     D.Scaling.uiscale = UIParent:GetScale()
-    D.Scaling.screenWidth = D.Scaling.physicalWidth
-    D.Scaling.screenHeight = D.Scaling.physicalHeight
+    D.Scaling.screenWidth = GetScreenWidth() * UIParent:GetEffectiveScale() / 768
+    D.Scaling.screenHeight = GetScreenWidth() * UIParent:GetEffectiveScale() / 768
 
-    local width, height = D.Scaling.physicalWidth, D.Scaling.physicalHeight
+    local width, height = D.Scaling.screenWidth, D.Scaling.screenHeight
 
     D.UIParent:SetSize(width, height)
     D.Scaling.originalHeight = D.UIParent:GetHeight()
@@ -85,8 +86,11 @@ function DiesalGUI:PixelScaleChanged(event)
         S.resolution = format("%dx%d", S.physicalWidth, S.physicalHeight)
         S.perfect = 768 / S.physicalHeight
     end
+    self:UIScale()
 end
 
+DiesalGUI:UIScale()
+
 DUIParent:SetScript("OnEvent", function(self, event, ...)
     if event == "UI_SCALE_CHANGED" then
         DiesalGUI:PixelScaleChanged(event)
@@ -289,6 +293,9 @@ function DiesalGUI:Create(objectType, name, methods)
         if object.OnAcquire then
             object:OnAcquire()
         end
+        if object.SetScale then
+            object:SetScale(DUIParent:GetEffectiveScale() * GetScreenHeight() / 768)
+        end
         return object
         ---@diagnostic disable-next-line: missing-return
     end

DiesalGUI-2.0/Objects/Accordian.lua

@@ -56,12 +56,12 @@ local function Constructor()
     ---@field content Frame
     ---@field children DiesalAccordianSection[]
     local self = DiesalGUI:Create(Type, true)
-
     self.isContainer = true
 
+    ---@class SelfFrame
     local frame = CreateFrame("Frame", nil, DiesalGUI.UIParent)
-    self.frame = frame
 
+    self.frame = frame
     self.defaults = {}
     -- Events
     -- OnAcquire, OnRelease, OnHeightSet, OnWidthSet
@@ -76,7 +76,7 @@ local function Constructor()
         self[method] = func
     end ]]
     -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
+    self:SetObj(self.frame)
     return self
 end
 DiesalGUI:RegisterObjectConstructor(Type, Constructor, Version)

DiesalGUI-2.0/Objects/AccordianSection.lua

@@ -183,7 +183,7 @@ local methods = {
     UpdateHeight = function(self)
         local settings, children = self.settings, self.children
         local contentHeight = 0
-        self.content:SetPoint("TOPLEFT", self.frame, 0, settings.button and -settings.buttonHeight or 0)
+        self.content:SetPoint("TOPLEFT", self.frame, -1, settings.button and -settings.buttonHeight or 0)
 
         if settings.expanded then
             contentHeight = settings.contentPadding[3] + settings.contentPadding[4]
@@ -228,7 +228,7 @@ local function Constructor()
 
     self.defaults = {
         button = true,
-        contentPadding = { 0, 0, 3, 1 },
+        contentPadding = { 0, 0, 3, 0 },
         expanded = true,
         buttonHeight = 16,
         subsection = false,
@@ -257,8 +257,8 @@ local function Constructor()
     text:SetPoint("TOPLEFT", 15, -1)
     text:SetPoint("BOTTOMRIGHT", -15, 0)
     text:SetHeight(0)
-    text:SetJustifyH("MIDDLE")
-    text:SetJustifyH("LEFT")
+    text:SetJustifyH("CENTER")
+    --text:SetJustifyH("LEFT")
     text:SetWordWrap(false)
 
     local content = self:CreateRegion("Frame", "content", frame)
@@ -266,6 +266,7 @@ local function Constructor()
     content:SetPoint("TOPRIGHT", frame, 0, 0)
     content:SetHeight(10)
     self:SetMethods(methods)
+    self:SetObj(self.frame)
     return self
 end
 DiesalGUI:RegisterObjectConstructor(Type, Constructor, Version)

DiesalGUI-2.0/Objects/Bar.lua

@@ -196,6 +196,7 @@ local function Constructor()
 
     -- ~~ Methods ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     self:SetMethods(methods)
+    self:SetObj(self.frame)
     --[[ for method, func in pairs(methods) do
         self[method] = func
     end ]]

DiesalGUI-2.0/Objects/Branch.lua

@@ -323,7 +323,7 @@ local function Constructor()
     text:SetPoint("TOPLEFT", 14, -1)
     text:SetPoint("BOTTOMRIGHT", -4, 0)
     text:SetHeight(0)
-    text:SetJustifyH("TOP")
+    --text:SetJustifyH("TOP")
     text:SetJustifyH("LEFT")
     text:SetWordWrap(false)
 
@@ -333,6 +333,7 @@ local function Constructor()
     content:SetHeight(0)
     -- ~~ Methods ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     self:SetMethods(methods)
+    self:SetObj(self.frame)
     --[[ for method, func in pairs(methods) do
         self[method] = func
     end ]]

DiesalGUI-2.0/Objects/Button.lua

@@ -81,7 +81,6 @@ local function Constructor(name)
     local self = DiesalGUI:Create(Type, true)
     local frame = CreateFrame("Button", name, DiesalGUI.UIParent)
     self.frame = frame
-    self.frame.m = self
     self.defaults = {
         height = 32,
         width = 32,
@@ -118,6 +117,7 @@ local function Constructor(name)
     end)
     -- ~~ Methods ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     self:SetMethods(methods)
+    self:SetObj(self.frame)
     --[[ for method, func in pairs(methods) do
         self[method] = func
     end ]]

DiesalGUI-2.0/Objects/CheckBox.lua

@@ -180,6 +180,7 @@ local function Constructor()
 
     -- ~~ Methods ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     self:SetMethods(methods)
+    self:SetObj(self.frame)
     --[[ for method, func in pairs(methods) do
         self[method] = func
     end ]]

DiesalGUI-2.0/Objects/ComboBox.lua

@@ -198,6 +198,7 @@ local methods = {
     ["SetText"] = function(self, text)
         self.editBox:SetText(text)
     end,
+    ---@param j "LEFT"|"CENTER"|"RIGHT"
     ["SetJustify"] = function(self, j)
         self.editBox:SetJustifyH(j)
     end,
@@ -248,7 +249,7 @@ local function Constructor()
     editBox:SetPoint("BOTTOMLEFT")
     editBox:SetAutoFocus(false)
     editBox:SetJustifyH("RIGHT")
-    editBox:SetJustifyV("CENTER")
+    editBox:SetJustifyV("MIDDLE")
     editBox:SetTextInsets(1, 2, 2, 0)
     editBox:SetScript("OnEnterPressed", function(this)
         local text = this:GetText()
@@ -305,6 +306,7 @@ local function Constructor()
     self:CreateRegion("Frame", "content", dropdown)
     -- ~~ Methods ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     self:SetMethods(methods)
+    self:SetObj(self.frame)
     --[[ for method, func in pairs(methods) do
         self[method] = func
     end ]]

DiesalGUI-2.0/Objects/ComboBoxItem.lua

@@ -119,7 +119,7 @@ local function Constructor()
     local text = self:CreateRegion("FontString", "text", frame)
     text:SetPoint("TOPLEFT", 12, -2)
     text:SetPoint("BOTTOMRIGHT", 0, 0)
-    text:SetJustifyH("TOP")
+    --text:SetJustifyH("TOP")
     text:SetJustifyH("LEFT")
     text:SetWordWrap(false)
 
@@ -135,6 +135,7 @@ local function Constructor()
 
     -- ~~ Methods ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     self:SetMethods(methods)
+    self:SetObj(self.frame)
     --[[ for method, func in pairs(methods) do
         self[method] = func
     end ]]

DiesalGUI-2.0/Objects/Container.lua

@@ -58,6 +58,7 @@ local function Constructor()
     for k, v in pairs(ContainerMethods) do
         self[k] = v
     end
+    self:SetObj(self.frame)
     return self
 end
 

DiesalGUI-2.0/Objects/DropDown.lua

@@ -119,7 +119,7 @@ local methods = {
     end,
 
     ---@param self Diesal.GUI.Object.DropDown
-    ---@param list table<integer, Diesal.GUI.DropDownItem.Settings>
+    ---@param list Diesal.GUI.DropDownItem.Settings[]
     SetList = function(self, list)
         self:ReleaseChildren()
         self:SetText("")
@@ -128,7 +128,7 @@ local methods = {
         local foldColor = "353535"
         local expandColor = "5a5a5a"
         self.dropdown:SetFrameStrata("TOOLTIP")
-        for position, item in ipairs(list) do
+        for position, item in ipairs(settings.list) do
             local dropdownItem = DiesalGUI:Create("DiesalDropDownItem")
             DiesalGUI:OnMouse(dropdownItem.frame, "LeftButton")
             dropdownItem:SetParentObject(self, true)
@@ -356,7 +356,7 @@ local methods = {
 ---@field itemHeight number
 ---@field width number
 ---@field height number
----@field list? table
+---@field list?  Diesal.GUI.DropDownItem.Settings[]
 ---@field multiSelect? boolean
 ---@field dropdownWidth? number
 
@@ -460,6 +460,7 @@ local function Constructor()
         self[method] = func
     end ]]
     -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    self:SetObj(self.frame)
     return self
 end
 DiesalGUI:RegisterObjectConstructor(Type, Constructor, Version)

DiesalGUI-2.0/Objects/DropDownItem.lua

@@ -166,7 +166,7 @@ local function Constructor()
     local text = self:CreateRegion("FontString", "text", frame)
     text:SetPoint("TOPLEFT", 12, -2)
     text:SetPoint("BOTTOMRIGHT", 0, 0)
-    text:SetJustifyH("TOP")
+    text:SetJustifyH("CENTER")
     text:SetJustifyH("LEFT")
     text:SetWordWrap(false)
 
@@ -184,6 +184,7 @@ local function Constructor()
     icon2:Hide()
     -- ~~ Methods ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     self:SetMethods(methods)
+    self:SetObj(self.frame)
     --[[ for method, func in pairs(methods) do
         self[method] = func
     end ]]

DiesalGUI-2.0/Objects/IconToggle.lua

@@ -90,14 +90,14 @@ local methods = {
 
         self:SetWidth(settings.width)
         self:SetHeight(settings.height)
-        self.check:SetFont(MaterialSymbolsRounded:GetFont(), settings.height + 1, "")
+        self.check:SetFont(DiesalFontNormal:GetFont(), settings.height + 1, "")
     end,
 
     ---@param self Diesal.GUI.Object.IconToggle
     ---@param value boolean
     SetChecked = function(self, value)
         self.settings.checked = value
-        self.check:SetText(value and DiesalStyle.MaterialIcon("check_box") or DiesalStyle.MaterialIcon("check_box_outline_blank"))
+        self.check:SetText(value and DiesalStyle.FontAwesomeIcon("check-square") or DiesalStyle.FontAwesomeIcon("square"))
         self.frame:SetChecked(value)
 
         self[self.settings.disabled and "Disable" or "Enable"](self)
@@ -192,7 +192,7 @@ local function Constructor()
     local check = self:CreateRegion("FontString", "check", frame)
     check:SetAllPoints(frame, true)
     --check:SetAllPoints(frame, true)
-    check:SetFont(MaterialSymbolsRounded:GetFont(), self.defaults.height, "")
+    check:SetFont(DiesalFontNormal:GetFont(), self.defaults.height, "")
     -- Setting self.check again is pointless when CreateRegion already does it....
     -- self.check = check
 
@@ -248,6 +248,7 @@ local function Constructor()
 
     -- ~~ Methods ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     self:SetMethods(methods)
+    self:SetObj(self.frame)
     --[[ for method, func in pairs(methods) do
         self[method] = func
     end ]]

DiesalGUI-2.0/Objects/Input.lua

@@ -103,7 +103,7 @@ local function Constructor()
     editBox:SetAllPoints()
     editBox:SetAutoFocus(false)
     editBox:SetJustifyH("LEFT")
-    editBox:SetJustifyV("CENTER")
+    editBox:SetJustifyV("MIDDLE")
     editBox:SetTextInsets(3, 0, 2, 0)
     editBox:SetScript("OnEnterPressed", function(this, ...)
         self:FireEvent("OnEnterPressed", ...)
@@ -127,6 +127,7 @@ local function Constructor()
 
     -- ~~ Methods ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     self:SetMethods(methods)
+    self:SetObj(self.frame)
     --[[ for method, func in pairs(methods) do
         self[method] = func
     end ]]

DiesalGUI-2.0/Objects/ObjectBase.lua

@@ -245,6 +245,14 @@ local ObjectBase = {
         end
     end,
 
+    ---@generic T : Diesal.GUI.ObjectBase
+    ---@param self T
+    ---@param frame Frame
+    SetObj = function(self, frame)
+        ---@diagnostic disable-next-line: inject-field
+        frame.obj = self
+    end,
+
     ---@generic T : Diesal.GUI.ObjectBase
     ---@param self T | Diesal.GUI.ObjectBase
     ResetFonts = function(self)
@@ -341,8 +349,8 @@ local ObjectBase = {
     ---@param event string
     FireEvent = function(self, event, ...)
         if self.eventListeners[event] then
-            for _, listner in ipairs(self.eventListeners[event]) do
-                listner(self, event, ...)
+            for _, listener in ipairs(self.eventListeners[event]) do
+                listener(self, event, ...)
             end
             --return self.eventListeners[event](self, event, ...)
         end
@@ -458,11 +466,14 @@ DiesalGUI.ObjectBase = ObjectBase
 
 ---@alias DiesalObjectBase Diesal.GUI.ObjectBase
 
+---@class SelfFrame : Frame
+---@field obj DiesalObjectBase
+
 -- Returns an Object Base
 ---@param objectType string | Diesal.Object.Type
 local Constructor = function(objectType)
     ---@class Diesal.GUI.ObjectBase : Diesal.GUI.ObjectBase.Methods
-    ---@field frame Frame
+    ---@field frame SelfFrame
     ---@field isContainer boolean
     ---@field type Diesal.Object.Type
     ---@field fontStrings { [string]: Diesal.GUI.Region.FontString }

DiesalGUI-2.0/Objects/ScrollFrame.lua

@@ -307,6 +307,7 @@ local function Constructor()
     end)
     -- ~~ Methods ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     self:SetMethods(methods)
+    self:SetObj(self.frame)
     --[[ for method, func in pairs(methods) do
         self[method] = func
     end ]]

DiesalGUI-2.0/Objects/ScrollingEditBox.lua

@@ -82,6 +82,7 @@ local methods = {
         self:Show()
     end,
     ["OnRelease"] = function(self) end,
+    ---@param self Diesal.GUI.Object.ScrollingEditBox
     ["ApplySettings"] = function(self)
         local settings = self.settings
 
@@ -152,13 +153,29 @@ local methods = {
 
 ---@class DiesalScrollingEditBox : Diesal.GUI.Object.ScrollingEditBox
 
+---@class Diesal.GUI.Object.ScrollingEditBox.Settings : Diesal.GUI.Object.ScrollingEditBox.Defaults
+---@field justifyH JustifyH
+---@field justifyV JustifyV
+---@field contentHeight? number
+---@field text? string
+
 -- ~~| ScrollingEditBox Constructor |~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 local function Constructor()
     ---@class Diesal.GUI.Object.ScrollingEditBox : Diesal.GUI.ObjectBase, Diesal.GUI.ScrollingEditBox.Methods
+    ---@field scrollFrameContainer Frame
+    ---@field scrollFrame ScrollFrame
+    ---@field editBox EditBox
+    ---@field scrollBar Frame
+    ---@field buttonUp Frame
+    ---@field buttonDown Frame
+    ---@field track Frame
+    ---@field grip Frame
+    ---@field settings Diesal.GUI.Object.ScrollingEditBox.Settings
     local self = DiesalGUI:Create(Type, true)
     local frame = CreateFrame("Frame", nil, DiesalGUI.UIParent)
     self.frame = frame
     -- ~~ Default Settings ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ---@class Diesal.GUI.Object.ScrollingEditBox.Defaults
     self.defaults = {
         scrollBarButtonHeight = 1,
         scrollBarWidth = 4,
@@ -284,6 +301,7 @@ local function Constructor()
     end)
     -- ~~ Methods ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     self:SetMethods(methods)
+    self:SetObj(self.frame)
     --[[ for method, func in pairs(methods) do
         self[method] = func
     end ]]

DiesalGUI-2.0/Objects/ScrollingMessageFrame.lua

@@ -274,6 +274,7 @@ local function Constructor()
     end)
     -- ~~ Methods ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     self:SetMethods(methods)
+    self:SetObj(self.frame)
     --[[ for method, func in pairs(methods) do
         self[method] = func
     end ]]

DiesalGUI-2.0/Objects/Spinner.lua

@@ -233,19 +233,19 @@ local methods = {
 ---@class DiesalSpinner : Diesal.GUI.Object.Spinner
 
 ---@class Diesal.GUI.Object.Spinner.Settings.Defaults
----@field height number
----@field width number
----@field mouse boolean
----@field mouseWheel boolean
+---@field bar boolean
 ---@field buttons boolean
 ---@field buttonsWidth number
----@field bar boolean
----@field min number
+---@field height number
 ---@field max number
+---@field min number
+---@field mouse boolean
+---@field mouseWheel boolean
 ---@field prefix? string
 ---@field shiftStep number
 ---@field step number
 ---@field suffix? string
+---@field width number
 
 ---@class Diesal.GUI.Object.Spinner.Settings: Diesal.GUI.Object.Spinner.Settings.Defaults
 ---@field number number
@@ -289,7 +289,7 @@ local function Constructor()
     editBox:SetPoint("BOTTOM")
     editBox:SetAutoFocus(false)
     editBox:SetJustifyH("CENTER")
-    editBox:SetJustifyV("CENTER")
+    editBox:SetJustifyV("MIDDLE")
     editBox:SetTextInsets(0, 0, 0, 0)
     editBox:SetNumber(self.defaults.min)
     ---@param this EditBox
@@ -345,6 +345,7 @@ local function Constructor()
 
     -- ~~ Methods ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     self:SetMethods(methods)
+    self:SetObj(self.frame)
     --[[ for method, func in pairs(methods) do
         self[method] = func
     end ]]

DiesalGUI-2.0/Objects/Text.lua

@@ -34,6 +34,7 @@ local function Constructor()
     --self.fontString = fontString
     self.fontStrings[#self.fontStrings + 1] = self.fontString
     self:SetMethods(methods)
+    self:SetObj(self.frame)
     --[[ for method, func in pairs(methods) do
         self[method] = func
     end ]]

DiesalGUI-2.0/Objects/Toggle.lua

@@ -237,6 +237,7 @@ local function Constructor()
 
     -- ~~ Methods ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     self:SetMethods(methods)
+    self:SetObj(self.frame)
     --[[ for method, func in pairs(methods) do
         self[method] = func
     end ]]

DiesalGUI-2.0/Objects/Tree.lua

@@ -95,6 +95,7 @@ local function Constructor()
     content:SetAllPoints()
     -- ~~ Methods ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     self:SetMethods(methods)
+    self:SetObj(self.frame)
     --[[ for method, func in pairs(methods) do
         self[method] = func
     end ]]

DiesalGUI-2.0/Objects/Window.lua

@@ -22,6 +22,9 @@ local Stylesheet = {
     },
     ["frame-shadow"] = {
         type = "shadow",
+        edgeSize = 0,
+        offset = { 5, 5, 5, 5},
+        edgeFile = [[interface/reforging/itemupgradefxtooltipglow]],
     },
     ["titleBar-color"] = {
         type = "texture",
@@ -249,8 +252,6 @@ local methods = {
 ---@alias PaddingTop number
 ---@alias PaddingBottom number
 
----@class Diesal.GUI.Window.Frame : Frame, { obj: Diesal.GUI.Object.Window }
-
 ---@class Diesal.GUI.Window.Settings
 ---@field footer boolean -- false
 ---@field footerHeight number -- 21
@@ -262,7 +263,7 @@ local methods = {
 ---@field maxWidth number -- 9999
 ---@field minHeight number -- 200
 ---@field minWidth number -- 200
----@field padding { [1]: PaddingLeft, [2]: PaddingBottom, [3]: PaddingTop, [4]: PaddingBottom }
+---@field padding { [1]: PaddingLeft, [2]: PaddingRight, [3]: PaddingTop, [4]: PaddingBottom } -- Left, Right, Top, Bottom
 ---@field sizerB boolean -- true
 ---@field sizerBR boolean -- true
 ---@field sizerBRHeight number -- 6,
@@ -281,7 +282,7 @@ local methods = {
 -- | Constructor |~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 local function Constructor()
     ---@class Diesal.GUI.Object.Window : Diesal.GUI.ObjectBase, Diesal.GUI.Window.Methods
-    ---@field frame Diesal.GUI.Window.Frame
+    ---@field frame Frame
     ---@field titleBar Button
     ---@field closeButton Button
     ---@field titletext FontString
@@ -298,8 +299,8 @@ local function Constructor()
     local self = DiesalGUI:Create(Type, true)
     self.isContainer = true
 
-    ---@type Diesal.GUI.Window.Frame
     local frame = CreateFrame("Frame", nil, DiesalGUI.UIParent)
+    frame:SetClampedToScreen(true)
 
     self.frame = frame
 
@@ -356,8 +357,6 @@ local function Constructor()
 
     frame:SetToplevel(true)
 
-    frame.obj = self
-
     local titleBar = self:CreateRegion("Button", "titleBar", frame)
     titleBar:SetPoint("TOPLEFT")
     titleBar:SetPoint("TOPRIGHT")
@@ -450,6 +449,7 @@ local function Constructor()
     end)
     -- ~~ Methods ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     self:SetMethods(methods)
+    self:SetObj(self.frame)
     --[[ for method, func in pairs(methods) do
         self[method] = func
     end ]]

DiesalMenu-2.0/Objects/MenuItem.lua

@@ -157,7 +157,7 @@ local function Constructor()
     local text = self:CreateRegion("FontString", "text", frame)
     text:SetPoint("TOP", 0, -2)
     text:SetPoint("BOTTOM", 0, 0)
-    text:SetJustifyH("TOP")
+    --text:SetJustifyH("TOP")
     text:SetJustifyH("LEFT")
     text:SetWordWrap(false)