cluaupp 1.3.0 → 1.4.0

package/templates/game/libs/TopbarPlus/_impl/Elements/Dropdown.lua

@@ -1,315 +0,0 @@
-local TweenService = game:GetService("TweenService")
-local RunService = game:GetService("RunService")
-local Themes = require(script.Parent.Parent.Features.Themes)
-local PADDING = 0 -- used to be 8
-return function(icon)
-	
-	local dropdown = Instance.new("Frame") -- Instance.new("CanvasGroup")
-	dropdown.Name = "Dropdown"
-	dropdown.AutomaticSize = Enum.AutomaticSize.X
-	dropdown.BackgroundTransparency = 1
-	dropdown.BorderSizePixel = 0
-	dropdown.AnchorPoint = Vector2.new(0.5, 0)
-	dropdown.Position = UDim2.new(0.5, 0, 1, 10)
-	dropdown.ZIndex = -2
-	dropdown.ClipsDescendants = true
-	dropdown.Parent = icon.widget
-
-	-- Account for PreferredTransparency which can be set by every player
-	local GuiService = game:GetService("GuiService")
-	icon:setBehaviour("Dropdown", "BackgroundTransparency", function(value)
-		local preference = GuiService.PreferredTransparency
-		local newValue = value * preference
-		if value == 1 then
-			return value
-		end
-		return newValue
-	end)
-	icon.janitor:add(GuiService:GetPropertyChangedSignal("PreferredTransparency"):Connect(function()
-		icon:refreshAppearance(dropdown, "BackgroundTransparency")
-	end))
-
-	local UICorner = Instance.new("UICorner")
-	UICorner.Name = "DropdownCorner"
-	UICorner.CornerRadius = UDim.new(0, 10)
-	UICorner.Parent = dropdown
-
-	local dropdownScroller = Instance.new("ScrollingFrame")
-	dropdownScroller.Name = "DropdownScroller"
-	dropdownScroller.AutomaticSize = Enum.AutomaticSize.X
-	dropdownScroller.BackgroundTransparency = 1
-	dropdownScroller.BorderSizePixel = 0
-	dropdownScroller.AnchorPoint = Vector2.new(0, 0)
-	dropdownScroller.Position = UDim2.new(0, 0, 0, 0)
-	dropdownScroller.ZIndex = -1
-	dropdownScroller.ClipsDescendants = true
-	dropdownScroller.Visible = true
-	dropdownScroller.VerticalScrollBarInset = Enum.ScrollBarInset.None --ScrollBar
-	dropdownScroller.VerticalScrollBarPosition = Enum.VerticalScrollBarPosition.Right
-	dropdownScroller.Active = false
-	dropdownScroller.ScrollingEnabled = true
-	dropdownScroller.AutomaticCanvasSize = Enum.AutomaticSize.Y
-	dropdownScroller.ScrollBarThickness = 5
-	dropdownScroller.ScrollBarImageColor3 = Color3.fromRGB(255, 255, 255)
-	dropdownScroller.ScrollBarImageTransparency = 0.8
-	dropdownScroller.CanvasSize = UDim2.new(0, 0, 0, 0)
-	dropdownScroller.Selectable = false
-	dropdownScroller.Active = true
-	dropdownScroller.Parent = dropdown
-
-	local TweenDuration = Instance.new("NumberValue") -- this helps to change the speed to open / close in modifyTheme()
-	TweenDuration.Name = "DropdownSpeed"
-	TweenDuration.Value = 0.07
-	TweenDuration.Parent = dropdown
-
-	local dropdownPadding = Instance.new("UIPadding")
-	dropdownPadding.Name = "DropdownPadding"
-	dropdownPadding.PaddingTop = UDim.new(0, PADDING)
-	dropdownPadding.PaddingBottom = UDim.new(0, PADDING)
-	dropdownPadding.Parent = dropdownScroller
-
-	local dropdownList = Instance.new("UIListLayout")
-	dropdownList.Name = "DropdownList"
-	dropdownList.FillDirection = Enum.FillDirection.Vertical
-	dropdownList.SortOrder = Enum.SortOrder.LayoutOrder
-	dropdownList.HorizontalAlignment = Enum.HorizontalAlignment.Center
-	dropdownList.HorizontalFlex = Enum.UIFlexAlignment.SpaceEvenly
-	dropdownList.Parent = dropdownScroller
-
-	local dropdownJanitor = icon.dropdownJanitor
-	local Icon = require(icon.iconModule)
-	icon.dropdownChildAdded:Connect(function(childIcon)
-		local _, modificationUID = childIcon:modifyTheme({
-			{"Widget", "BorderSize", 0},
-			{"IconCorners", "CornerRadius", UDim.new(0, 10)},
-			{"Widget", "MinimumWidth", 190},
-			{"Widget", "MinimumHeight", 58},
-			{"IconLabel", "TextSize", 20},
-			{"IconOverlay", "Size", UDim2.new(1, 0, 1, 0)},
-			{"PaddingLeft", "Size", UDim2.fromOffset(25, 0)},
-			{"Notice", "Position", UDim2.new(1, -24, 0, 5)},
-			{"ContentsList", "HorizontalAlignment", Enum.HorizontalAlignment.Left},
-			{"Selection", "Size", UDim2.new(1, -PADDING, 1, -PADDING)},
-			{"Selection", "Position", UDim2.new(0, PADDING/2, 0, PADDING/2)},
-		})
-		task.defer(function()
-			childIcon.joinJanitor:add(function()
-				childIcon:removeModification(modificationUID)
-			end)
-		end)
-	end)
-	icon.dropdownSet:Connect(function(arrayOfIcons)
-		for i, otherIconUID in pairs(icon.dropdownIcons) do
-			local otherIcon = Icon.getIconByUID(otherIconUID)
-			otherIcon:destroy()
-		end
-		if type(arrayOfIcons) == "table" then
-			for i, otherIcon in pairs(arrayOfIcons) do
-				otherIcon:joinDropdown(icon)
-			end
-		end
-	end)
-
-	local function updateMaxIcons()
-		--icon:modifyTheme({"Dropdown", "Visible", icon.isSelected})
-		local maxIcons = dropdown:GetAttribute("MaxIcons")
-		if not maxIcons then return 0 end
-		local children = {}
-		for _, child in pairs(dropdownScroller:GetChildren()) do
-			if child:IsA("GuiObject") and child.Visible then
-				table.insert(children, child)
-			end
-		end
-
-		table.sort(children, function(a, b) return a.AbsolutePosition.Y < b.AbsolutePosition.Y end)
-		local totalHeight = 0
-		local maxIconsRoundedUp = math.ceil(maxIcons)
-		for i = 1, maxIconsRoundedUp do
-			local child = children[i]
-			if not child then break end
-			local height = child.AbsoluteSize.Y
-			local isReduced = i == maxIconsRoundedUp and maxIconsRoundedUp ~= maxIcons
-			if isReduced then
-				height *= (maxIcons - maxIconsRoundedUp + 1)
-			end
-			totalHeight += height
-		end
-		totalHeight += dropdownPadding.PaddingTop.Offset + dropdownPadding.PaddingBottom.Offset
-		return totalHeight
-	end
-	
-	local openTween = nil
-	local closeTween = nil
-	local currentSpeedMultiplier = nil
-	local currentTweenInfo = nil
-	local function getTweenInfo()
-		local speedMultiplier = Themes.getInstanceValue(dropdown, "MaxIcons") or 1
-		if currentSpeedMultiplier and currentSpeedMultiplier == speedMultiplier and currentTweenInfo then
-			return currentTweenInfo
-		end
-		local newTweenInfo = TweenInfo.new(
-			TweenDuration.Value * speedMultiplier,
-			Enum.EasingStyle.Exponential,
-			Enum.EasingDirection.Out
-		)
-		currentTweenInfo = newTweenInfo
-		currentSpeedMultiplier = speedMultiplier
-		return newTweenInfo
-	end
-	local function updateVisibility()
-		-- Update visibiliy of dropdown using tween transition
-		local tweenInfo = getTweenInfo()
-		
-		if openTween then
-			openTween:Cancel()
-			openTween = nil
-		end
-		if closeTween then
-			closeTween:Cancel()
-			closeTween = nil
-		end
-
-		if icon.isSelected then
-			local height = updateMaxIcons()
-			dropdown.Visible = true
-			dropdown.BackgroundTransparency = 0 -- no transparency so it looks solid
-			dropdown.Size = UDim2.new(0, dropdown.Size.X.Offset, 0, 0) -- reset height to 0 before tween
-
-			openTween = TweenService:Create(dropdown, tweenInfo, {Size = UDim2.new(0, dropdown.Size.X.Offset, 0, height)})
-			openTween:Play()
-			openTween.Completed:Connect(function()
-				openTween = nil
-			end)
-		else
-			local closeTweenInfo = TweenInfo.new(0)
-			closeTween = TweenService:Create(dropdown, closeTweenInfo, {Size = UDim2.new(0, dropdown.Size.X.Offset, 0, 0)})
-			closeTween:Play()
-			closeTween.Completed:Connect(function()
-				closeTween = nil
-			end)
-		end
-	end
-
-	dropdownJanitor:add(icon.toggled:Connect(updateVisibility))
-	updateVisibility()
-	--task.delay(0.2, updateVisibility)
-
-	local function updateChildSize()
-		local tweenInfo = getTweenInfo()
-		if not icon.isSelected then return end
-		if openTween then
-			openTween:Cancel()
-			openTween = nil
-		end
-		if closeTween then
-			closeTween:Cancel()
-			closeTween = nil
-		end
-		
-		RunService.Heartbeat:Wait()
-		
-		local height = updateMaxIcons()
-
-		openTween = TweenService:Create(dropdown, tweenInfo, {Size = UDim2.new(0, dropdown.Size.X.Offset, 0, height)})
-		openTween:Play()
-		openTween.Completed:Connect(function()	
-			openTween = nil
-		end)
-	end
-
-	dropdownJanitor:add(icon.toggled:Connect(updateVisibility))
-
-	-- Ensures canvas and size stay synced (original updateMaxIcons logic)
-	local updateCount = 0
-	local isUpdating = false
-
-	-- This updates the scrolling frame to only display a scroll
-	-- length equal to the distance produced by its MaxIcons
-	local function updateMaxIconsListener()
-		updateCount += 1
-		if isUpdating then return end
-		local myUpdateCount = updateCount
-		isUpdating = true
-		task.defer(function()
-			isUpdating = false
-			if updateCount ~= myUpdateCount then
-				updateMaxIconsListener()
-			end
-		end)
-		local maxIcons = dropdown:GetAttribute("MaxIcons")
-		if not maxIcons then return end
-
-		local orderedInstances = {}
-		for _, child in pairs(dropdownScroller:GetChildren()) do
-			if child:IsA("GuiObject") and child.Visible then
-				table.insert(orderedInstances, {child, child.AbsolutePosition.Y})
-			end
-		end
-		table.sort(orderedInstances, function(a, b) return a[2] < b[2] end)
-
-		local totalHeight = 0
-		local hasSetNextSelection = false
-		local maxIconsRoundedUp = math.ceil(maxIcons)
-		for i = 1, maxIconsRoundedUp do
-			local group = orderedInstances[i]
-			if not group then break end
-			local child = group[1]
-			local height = child.AbsoluteSize.Y
-			local isReduced = i == maxIconsRoundedUp and maxIconsRoundedUp ~= maxIcons
-			if isReduced then
-				height = height * (maxIcons - maxIconsRoundedUp + 1)
-			end
-			totalHeight += height
-			if isReduced then
-				continue
-			end
-			local iconUID = child:GetAttribute("WidgetUID")
-			local childIcon = iconUID and Icon.getIconByUID(iconUID)
-			if childIcon then
-				local nextSelection = nil
-				if not hasSetNextSelection then
-					hasSetNextSelection = true
-					nextSelection = icon:getInstance("ClickRegion")
-				end
-				childIcon:getInstance("ClickRegion").NextSelectionUp = nextSelection
-			end
-		end
-		totalHeight += dropdownPadding.PaddingTop.Offset + dropdownPadding.PaddingBottom.Offset
-
-		dropdownScroller.Size = UDim2.fromOffset(0, totalHeight)
-
-	end
-
-	dropdownJanitor:add(dropdownScroller:GetPropertyChangedSignal("AbsoluteCanvasSize"):Connect(updateMaxIconsListener))
-	dropdownJanitor:add(dropdownScroller.ChildAdded:Connect(updateMaxIconsListener))
-	dropdownJanitor:add(dropdownScroller.ChildRemoved:Connect(updateChildSize)) -- rezise the dropdown when icon delects or adds
-	dropdownJanitor:add(dropdownScroller.ChildRemoved:Connect(updateMaxIconsListener))
-	dropdownJanitor:add(dropdown:GetAttributeChangedSignal("MaxIcons"):Connect(updateMaxIconsListener))
-	dropdownJanitor:add(dropdown:GetAttributeChangedSignal("MaxIcons"):Connect(updateChildSize))
-	dropdownJanitor:add(icon.childThemeModified:Connect(updateMaxIconsListener))
-	updateMaxIconsListener()
-
-	-- Ensures each child listens to visibility changes
-	local function connectVisibilityListeners(child)
-		if child:IsA("GuiObject") then
-			child:GetPropertyChangedSignal("Visible"):Connect(updateChildSize)
-			child:GetPropertyChangedSignal("Size"):Connect(updateChildSize) -- -- update max icons when child size changes
-		end
-	end
-	
-	-- For existing children
-	for _, child in pairs(dropdownScroller:GetChildren()) do
-		connectVisibilityListeners(child)
-	end
-	-- For new children
-	dropdownScroller.ChildAdded:Connect(function(child)
-		RunService.Heartbeat:Wait()
-		connectVisibilityListeners(child)
-		updateChildSize()
-	end)
-
-	-- On start, hide dropdown (prevent it showing as opened)
-	dropdown.Visible = false
-
-	return dropdown
-end

package/templates/game/libs/TopbarPlus/_impl/Elements/Indicator.lua

@@ -1,91 +0,0 @@
-return function(icon, Icon)
-
-	local widget = icon.widget
-	local contents = icon:getInstance("Contents")
-	local indicator = Instance.new("Frame")
-	indicator.Name = "Indicator"
-	indicator.LayoutOrder = 9999999
-	indicator.ZIndex = 6
-	indicator.Size = UDim2.new(0, 42, 0, 42)
-	indicator.BorderColor3 = Color3.fromRGB(0, 0, 0)
-	indicator.BackgroundTransparency = 1
-	indicator.Position = UDim2.new(1, 0, 0.5, 0)
-	indicator.BorderSizePixel = 0
-	indicator.BackgroundColor3 = Color3.fromRGB(0, 0, 0)
-	indicator.Parent = contents
-
-	local indicatorButton = Instance.new("Frame")
-	indicatorButton.Name = "IndicatorButton"
-	indicatorButton.BorderColor3 = Color3.fromRGB(0, 0, 0)
-	indicatorButton.AnchorPoint = Vector2.new(0.5, 0.5)
-	indicatorButton.BorderSizePixel = 0
-	indicatorButton.BackgroundColor3 = Color3.fromRGB(0, 0, 0)
-	indicatorButton.Parent = indicator
-	
-	local GuiService = game:GetService("GuiService")
-	local GamepadService = game:GetService("GamepadService")
-	local ourClickRegion = icon:getInstance("ClickRegion")
-	local function selectionChanged()
-		local selectedClickRegion = GuiService.SelectedObject
-		if selectedClickRegion == ourClickRegion then
-			indicatorButton.BackgroundTransparency = 1
-			indicatorButton.Position = UDim2.new(0.5, -2, 0.5, 0)
-			indicatorButton.Size = UDim2.fromScale(1.2, 1.2)
-		else
-			indicatorButton.BackgroundTransparency = 0.75
-			indicatorButton.Position = UDim2.new(0.5, 2, 0.5, 0)
-			indicatorButton.Size = UDim2.fromScale(1, 1)
-		end
-	end
-	icon.janitor:add(GuiService:GetPropertyChangedSignal("SelectedObject"):Connect(selectionChanged))
-	selectionChanged()
-
-	local imageLabel = Instance.new("ImageLabel")
-	imageLabel.LayoutOrder = 2
-	imageLabel.ZIndex = 15
-	imageLabel.AnchorPoint = Vector2.new(0.5, 0.5)
-	imageLabel.Size = UDim2.new(0.5, 0, 0.5, 0)
-	imageLabel.BackgroundTransparency = 1
-	imageLabel.Position = UDim2.new(0.5, 0, 0.5, 0)
-	imageLabel.Image = "rbxasset://textures/ui/Controls/XboxController/DPadUp@2x.png"
-	imageLabel.Parent = indicatorButton
-
-	local UICorner = Instance.new("UICorner")
-	UICorner.CornerRadius = UDim.new(1, 0)
-	UICorner.Parent = indicatorButton
-
-	local UserInputService = game:GetService("UserInputService")
-	local function setIndicatorVisible(visibility)
-		if visibility == nil then
-			visibility = indicator.Visible
-		end
-		if GamepadService.GamepadCursorEnabled then
-			visibility = false
-		end
-		if visibility then
-			icon:modifyTheme({"PaddingRight", "Size", UDim2.new(0, 0, 1, 0)}, "IndicatorPadding")
-		elseif indicator.Visible then
-			icon:removeModification("IndicatorPadding")
-		end
-		icon:modifyTheme({"Indicator", "Visible", visibility})
-		icon.updateSize:Fire()
-	end
-	icon.janitor:add(GamepadService:GetPropertyChangedSignal("GamepadCursorEnabled"):Connect(setIndicatorVisible))
-	icon.indicatorSet:Connect(function(keyCode)
-		local visibility = false
-		if keyCode then
-			imageLabel.Image = UserInputService:GetImageForKeyCode(keyCode)
-			visibility = true
-		end
-		setIndicatorVisible(visibility)
-	end)
-
-	local function updateSize()
-		local ySize = widget.AbsoluteSize.Y*0.96
-		indicator.Size = UDim2.new(0, ySize, 0, ySize)
-	end
-	widget:GetPropertyChangedSignal("AbsoluteSize"):Connect(updateSize)
-	updateSize()
-
-	return indicator
-end

package/templates/game/libs/TopbarPlus/_impl/Elements/Menu.lua

@@ -1,180 +0,0 @@
-return function(icon)
-
-	local menu = Instance.new("ScrollingFrame")
-	menu.Name = "Menu"
-	menu.BackgroundTransparency = 1
-	menu.Visible = true
-	menu.ZIndex = 1
-	menu.Size = UDim2.fromScale(1, 1)
-	menu.ClipsDescendants = true
-	menu.TopImage = ""
-	menu.BottomImage = ""
-	menu.HorizontalScrollBarInset = Enum.ScrollBarInset.Always
-	menu.CanvasSize = UDim2.new(0, 0, 1, -1) -- This -1 prevents a dropdown scrolling appearance bug
-	menu.ScrollingEnabled = true
-	menu.ScrollingDirection = Enum.ScrollingDirection.X
-	menu.ZIndex = 20
-	menu.ScrollBarThickness = 3
-	menu.ScrollBarImageColor3 = Color3.fromRGB(255, 255, 255)
-	menu.ScrollBarImageTransparency = 0.8
-	menu.BorderSizePixel = 0
-	menu.Selectable = false
-	
-	local Icon = require(icon.iconModule)
-	local menuUIListLayout = Icon.container.TopbarStandard:FindFirstChild("UIListLayout", true):Clone()
-	menuUIListLayout.Name = "MenuUIListLayout"
-	menuUIListLayout.VerticalAlignment = Enum.VerticalAlignment.Center
-	menuUIListLayout.Parent = menu
-
-	local menuGap = Instance.new("Frame")
-	menuGap.Name = "MenuGap"
-	menuGap.BackgroundTransparency = 1
-	menuGap.Visible = false
-	menuGap.AnchorPoint = Vector2.new(0, 0.5)
-	menuGap.ZIndex = 5
-	menuGap.Parent = menu
-	
-	local hasStartedMenu = false
-	local Themes = require(script.Parent.Parent.Features.Themes)
-	local function totalChildrenChanged()
-		
-		local menuJanitor = icon.menuJanitor
-		local totalIcons = #icon.menuIcons
-		if hasStartedMenu then
-			if totalIcons <= 0 then
-				menuJanitor:clean()
-				hasStartedMenu = false
-			end
-			return
-		end
-		hasStartedMenu = true
-		
-		-- Listen for changes
-		menuJanitor:add(icon.toggled:Connect(function()
-			if #icon.menuIcons > 0 then
-				icon.updateSize:Fire()
-			end
-		end))
-		
-		-- Modify appearance of menu icon when joined
-		local _, modificationUID = icon:modifyTheme({
-			{"Menu", "Active", true},
-		})
-		task.defer(function()
-			menuJanitor:add(function()
-				icon:removeModification(modificationUID)
-			end)
-		end)
-		
-		-- For right-aligned icons, this ensures their menus
-		-- close button appear instantly when selected (instead
-		-- of partially hidden from view)
-		local previousCanvasX = menu.AbsoluteCanvasSize.X
-		local function rightAlignCanvas()
-			if icon.alignment == "Right" then
-				local newCanvasX = menu.AbsoluteCanvasSize.X
-				local difference = previousCanvasX - newCanvasX
-				previousCanvasX = newCanvasX
-				menu.CanvasPosition = Vector2.new(menu.CanvasPosition.X - difference, 0)
-			end
-		end
-		menuJanitor:add(icon.selected:Connect(rightAlignCanvas))
-		menuJanitor:add(menu:GetPropertyChangedSignal("AbsoluteCanvasSize"):Connect(rightAlignCanvas))
-		
-		-- Apply a close selected image if the user hasn't applied thier own
-		local stateGroup = icon:getStateGroup()
-		local imageDeselected = Themes.getThemeValue(stateGroup, "IconImage", "Image", "Deselected")
-		local imageSelected = Themes.getThemeValue(stateGroup, "IconImage", "Image", "Selected")
-		if imageDeselected == imageSelected then
-			local fontLink = "rbxasset://fonts/families/FredokaOne.json"
-			local fontFace = Font.new(fontLink, Enum.FontWeight.Light, Enum.FontStyle.Normal)
-			icon:removeModificationWith("IconLabel", "Text", "Viewing")
-			icon:removeModificationWith("IconLabel", "Image", "Viewing")
-			icon:modifyTheme({
-				{"IconLabel", "FontFace", fontFace, "Selected"},
-				{"IconLabel", "Text", "X", "Selected"},
-				{"IconLabel", "TextSize", 20, "Selected"},
-				{"IconLabel", "TextStrokeTransparency", 0.8, "Selected"},
-				{"IconImage", "Image", "", "Selected"},
-			})
-		end
-
-		-- Change order of spot when alignment changes
-		local menuGap = icon:getInstance("MenuGap")
-		local function updateAlignent()
-			local alignment = icon.alignment
-			local spotIndex = -99999
-			local gapIndex = -99998
-			if alignment == "Right" then
-				spotIndex = 99999
-				gapIndex = 99998
-			end
-			icon:modifyTheme({"IconSpot", "LayoutOrder", spotIndex})
-			menuGap.LayoutOrder = gapIndex
-		end
-		menuJanitor:add(icon.alignmentChanged:Connect(updateAlignent))
-		updateAlignent()
-		
-		-- This updates the scrolling frame to only display a scroll
-		-- length equal to the distance produced by its MaxIcons
-		menu:GetAttributeChangedSignal("MenuCanvasWidth"):Connect(function()
-			local canvasWidth = menu:GetAttribute("MenuCanvasWidth")
-			local canvasY = menu.CanvasSize.Y
-			menu.CanvasSize = UDim2.new(0, canvasWidth, canvasY.Scale, canvasY.Offset)
-		end)
-		menuJanitor:add(icon.updateMenu:Connect(function()
-			local maxIcons = menu:GetAttribute("MaxIcons")
-			if not maxIcons then
-				return
-			end
-			local orderedInstances = {}
-			for _, child in pairs(menu:GetChildren()) do
-				local widgetUID = child:GetAttribute("WidgetUID")
-				if widgetUID and child.Visible then
-					table.insert(orderedInstances, {child, child.AbsolutePosition.X})
-				end
-			end
-			table.sort(orderedInstances, function(groupA, groupB)
-				return groupA[2] < groupB[2]
-			end)
-			local totalWidth = 0
-			for i = 1, maxIcons do
-				local group = orderedInstances[i]
-				if not group then
-					break
-				end
-				local child = group[1]
-				local width = child.AbsoluteSize.X + menuUIListLayout.Padding.Offset
-				totalWidth += width
-			end
-			menu:SetAttribute("MenuWidth", totalWidth)
-		end))
-		local function startMenuUpdate()
-			task.delay(0.1, function()
-				icon.startMenuUpdate:Fire()
-			end)
-		end
-		menuJanitor:add(menu.ChildAdded:Connect(startMenuUpdate))
-		menuJanitor:add(menu.ChildRemoved:Connect(startMenuUpdate))
-		menuJanitor:add(menu:GetAttributeChangedSignal("MaxIcons"):Connect(startMenuUpdate))
-		menuJanitor:add(menu:GetAttributeChangedSignal("MaxWidth"):Connect(startMenuUpdate))
-		startMenuUpdate()
-	end
-	
-	icon.menuChildAdded:Connect(totalChildrenChanged)
-	icon.menuSet:Connect(function(arrayOfIcons)
-		-- Reset any previous icons
-		for i, otherIconUID in pairs(icon.menuIcons) do
-			local otherIcon = Icon.getIconByUID(otherIconUID)
-			otherIcon:destroy()
-		end
-		-- Apply new icons
-		if type(arrayOfIcons) == "table" then
-			for i, otherIcon in pairs(arrayOfIcons) do
-				otherIcon:joinMenu(icon)
-			end
-		end
-	end)
-	
-	return menu
-end

package/templates/game/libs/TopbarPlus/_impl/Elements/Notice.lua

@@ -1,113 +0,0 @@
-return function(icon, Icon)
-
-	local notice = Instance.new("Frame")
-	notice.Name = "Notice"
-	notice.ZIndex = 25
-	notice.AutomaticSize = Enum.AutomaticSize.X
-	notice.BorderColor3 = Color3.fromRGB(0, 0, 0)
-	notice.BorderSizePixel = 0
-	notice.BackgroundTransparency = 0.1
-	notice.BackgroundColor3 = Color3.fromRGB(255, 255, 255)
-	notice.Visible = false
-	notice.Parent = icon.widget
-
-	local UICorner = Instance.new("UICorner")
-	UICorner.CornerRadius = UDim.new(1, 0)
-	UICorner.Parent = notice
-
-	local UIStroke = Instance.new("UIStroke")
-	UIStroke.Parent = notice
-
-	local noticeLabel = Instance.new("TextLabel")
-	noticeLabel.Name = "NoticeLabel"
-	noticeLabel.ZIndex = 26
-	noticeLabel.AnchorPoint = Vector2.new(0.5, 0.5)
-	noticeLabel.AutomaticSize = Enum.AutomaticSize.X
-	noticeLabel.Size = UDim2.new(1, 0, 1, 0)
-	noticeLabel.BackgroundTransparency = 1
-	noticeLabel.Position = UDim2.new(0.5, 0, 0.515, 0)
-	noticeLabel.BackgroundColor3 = Color3.fromRGB(0, 0, 0)
-	noticeLabel.FontSize = Enum.FontSize.Size14
-	noticeLabel.TextColor3 = Color3.fromRGB(0, 0, 0)
-	noticeLabel.Text = "1"
-	noticeLabel.TextWrapped = true
-	noticeLabel.TextWrap = true
-	noticeLabel.Font = Enum.Font.Arial
-	noticeLabel.Parent = notice
-	
-	local iconModule = script.Parent.Parent
-	local packages = iconModule.Packages
-	local Janitor = require(packages.Janitor)
-	local Signal = require(packages.GoodSignal)
-	local Utility = require(iconModule.Utility)
-	icon.noticeChanged:Connect(function(totalNotices)
-
-		-- Notice amount
-		if not totalNotices then
-			return
-		end
-		local exceeded99 = totalNotices > 99
-		local noticeDisplay = (exceeded99 and "99+") or totalNotices
-		noticeLabel.Text = noticeDisplay
-		if exceeded99 then
-			noticeLabel.TextSize = 11
-		end
-
-		-- Should enable
-		local enabled = true
-		if totalNotices < 1 then
-			enabled = false
-		end
-		local parentIcon = Icon.getIconByUID(icon.parentIconUID)
-		local dropdownOrMenuActive = #icon.dropdownIcons > 0 or #icon.menuIcons > 0
-		if icon.isSelected and dropdownOrMenuActive then
-			enabled = false
-		elseif parentIcon and not parentIcon.isSelected then
-			enabled = false
-		end
-		Utility.setVisible(notice, enabled, "NoticeHandler")
-
-	end)
-	icon.noticeStarted:Connect(function(customClearSignal, noticeId)
-	
-		if not customClearSignal then
-			customClearSignal = icon.deselected
-		end
-		local parentIcon = Icon.getIconByUID(icon.parentIconUID)
-		if parentIcon then
-			parentIcon:notify(customClearSignal)
-		end
-		
-		local noticeJanitor = icon.janitor:add(Janitor.new())
-		local noticeComplete = noticeJanitor:add(Signal.new())
-		noticeJanitor:add(icon.endNotices:Connect(function()
-			noticeComplete:Fire()
-		end))
-		noticeJanitor:add(customClearSignal:Connect(function()
-			noticeComplete:Fire()
-		end))
-		noticeId = noticeId or Utility.generateUID()
-		icon.notices[noticeId] = {
-			completeSignal = noticeComplete,
-			clearNoticeEvent = customClearSignal,
-		}
-		local function updateNotice()
-			icon.noticeChanged:Fire(icon.totalNotices)
-		end
-		icon.notified:Fire(noticeId)
-		icon.totalNotices += 1
-		updateNotice()
-		noticeComplete:Once(function()
-			noticeJanitor:destroy()
-			icon.totalNotices -= 1
-			icon.notices[noticeId] = nil
-			updateNotice()
-		end)
-	end)
-	
-	-- Establish the notice
-	notice:SetAttribute("ClipToJoinedParent", true)
-	icon:clipOutside(notice)
-	
-	return notice
-end