TimMenu: fixed some code

Author: titaniummachine1

TimMenu/Globals.lua

@@ -46,7 +46,7 @@ Globals.Defaults = {
 	DEFAULT_X = 100,
 	DEFAULT_Y = 100,
 	DEFAULT_W = 300,
-	DEFAULT_H = 200,
+	DEFAULT_H = 0,
 	SLIDER_WIDTH = 250,
 	TITLE_BAR_HEIGHT = 30,
 	WINDOW_CONTENT_PADDING = 8,

TimMenu/Main.lua

@@ -42,6 +42,13 @@ local function restoreWidgetFont(prev)
 	end
 end
 
+local function withFontReset(func, ...)
+	local prevFont = applyNextWidgetFont()
+	local results = {func(...)}
+	restoreWidgetFont(prevFont)
+	return table.unpack(results)
+end
+
 local _currentWindow = nil
 
 local Common = require("TimMenu.Common")
@@ -102,21 +109,15 @@ function TimMenu.Button(label)
 	if not win then
 		return false
 	end
-	local prevFont = applyNextWidgetFont()
-	local clicked = Widgets.Button(win, label)
-	restoreWidgetFont(prevFont)
-	return clicked
+	return withFontReset(Widgets.Button, win, label)
 end
 
 function TimMenu.Checkbox(label, state)
 	local win = TimMenu.GetCurrentWindow()
 	if not win then
 		return state, false
 	end
-	local prevFont = applyNextWidgetFont()
-	local newState, clicked = Widgets.Checkbox(win, label, state)
-	restoreWidgetFont(prevFont)
-	return newState, clicked
+	return withFontReset(Widgets.Checkbox, win, label, state)
 end
 
 function TimMenu.Text(text)
@@ -194,10 +195,7 @@ function TimMenu.Slider(label, value, min, max, step)
 	if not win then
 		return value, false
 	end
-	local prevFont = applyNextWidgetFont()
-	local newValue, changed = Widgets.Slider(win, label, value, min, max, step)
-	restoreWidgetFont(prevFont)
-	return newValue, changed
+	return withFontReset(Widgets.Slider, win, label, value, min, max, step)
 end
 
 function TimMenu.Separator(label)
@@ -213,43 +211,31 @@ function TimMenu.TextInput(label, text)
 	if not win then
 		return text, false
 	end
-	local prevFont = applyNextWidgetFont()
-	local newText, changed = Widgets.TextInput(win, label, text)
-	restoreWidgetFont(prevFont)
-	return newText, changed
+	return withFontReset(Widgets.TextInput, win, label, text)
 end
 
 function TimMenu.Dropdown(label, selectedIndex, options)
 	local win = TimMenu.GetCurrentWindow()
 	if not win then
 		return selectedIndex, false
 	end
-	local prevFont = applyNextWidgetFont()
-	local newIdx, changed = Widgets.Dropdown(win, label, selectedIndex, options)
-	restoreWidgetFont(prevFont)
-	return newIdx, changed
+	return withFontReset(Widgets.Dropdown, win, label, selectedIndex, options)
 end
 
 function TimMenu.Combo(label, selectedTable, options)
 	local win = TimMenu.GetCurrentWindow()
 	if not win then
 		return selectedTable, false
 	end
-	local prevFont = applyNextWidgetFont()
-	local newTable, changed = Widgets.Combo(win, label, selectedTable, options)
-	restoreWidgetFont(prevFont)
-	return newTable, changed
+	return withFontReset(Widgets.Combo, win, label, selectedTable, options)
 end
 
 function TimMenu.Selector(label, selectedIndex, options)
 	local win = TimMenu.GetCurrentWindow()
 	if not win then
 		return selectedIndex, false
 	end
-	local prevFont = applyNextWidgetFont()
-	local newIdx, changed = Widgets.Selector(win, label, selectedIndex, options)
-	restoreWidgetFont(prevFont)
-	return newIdx, changed
+	return withFontReset(Widgets.Selector, win, label, selectedIndex, options)
 end
 
 function TimMenu.TabControl(id, tabs, defaultSelection)
@@ -261,9 +247,7 @@ function TimMenu.TabControl(id, tabs, defaultSelection)
 			return 1, false
 		end
 	end
-	local prevFont = applyNextWidgetFont()
-	local newIndex, changed = Widgets.TabControl(win, id, tabs, defaultSelection)
-	restoreWidgetFont(prevFont)
+	local newIndex, changed = withFontReset(Widgets.TabControl, win, id, tabs, defaultSelection)
 	if type(defaultSelection) == "string" then
 		return tabs[newIndex], changed
 	end
@@ -377,19 +361,15 @@ callbacks.Unregister("Draw", "TimMenu_GlobalDraw")
 callbacks.Unregister("Draw", "zTimMenu_GlobalDraw")
 callbacks.Register("Draw", "zTimMenu_GlobalDraw", _TimMenu_GlobalDraw)
 
-function TimMenu.Textbox(label, text)
-	return TimMenu.TextInput(label, text)
-end
+-- Textbox is deprecated, use TextInput instead
+TimMenu.Textbox = TimMenu.TextInput
 
 function TimMenu.Keybind(label, currentKey)
 	local win = TimMenu.GetCurrentWindow()
 	if not win then
 		return currentKey, false
 	end
-	local prevFont = applyNextWidgetFont()
-	local keycode, changed = Widgets.Keybind(win, label, currentKey)
-	restoreWidgetFont(prevFont)
-	return keycode, changed
+	return withFontReset(Widgets.Keybind, win, label, currentKey)
 end
 
 function TimMenu.FontSet(name, size, weight)
@@ -422,8 +402,7 @@ function TimMenu.ColorPicker(label, color)
 	if not win then
 		return color, false
 	end
-	local newColor, changed = Widgets.ColorPicker(win, label, color)
-	return newColor, changed
+	return withFontReset(Widgets.ColorPicker, win, label, color)
 end
 
 function TimMenu.Tooltip(text)

TimMenu/Utils.lua

@@ -15,7 +15,7 @@ function Utils.PruneOrphanedWindows(windows, order)
 	end
 end
 
-function Utils.IsMouseOverWindow(win, mouseX, mouseY)
+function Utils.IsMouseOverWindow(win, mouseX, mouseY, titleHeight)
 	local titleHeight = require("TimMenu.Globals").Defaults.TITLE_BAR_HEIGHT
 	return mouseX >= win.X and mouseX <= win.X + win.W and mouseY >= win.Y and mouseY <= win.Y + titleHeight + win.H
 end