Merge branch 'main' of https://github.com/HavePepsiCola/Signs

Author: ryanlua

default.project.json

@@ -1,10 +1,11 @@
 {
   "name": "project",
   "tree": {
+    "$className": "DataModel",
     "Workspace": {
       "$className": "Workspace",
       "$ignoreUnknownInstances": true,
       "$path": "src/Workspace"
     }
   }
-}
+}

src/Workspace/SignsFree/PluginInfo/init.client.lua

@@ -28,7 +28,7 @@ widget.Name = "SignsFree"
 -- Set CreateButton.Icon to match Studio theme
 local function setIcon()
 	if settings().Studio.Theme == settings().Studio:GetAvailableThemes()[1] then -- Light theme
-		button.Icon = "rbxassetid://11959767978"
+		button.Icon = "rbxassetid://12060349104"
 	elseif settings().Studio.Theme == settings().Studio:GetAvailableThemes()[2] then -- Dark theme
 		button.Icon = "rbxassetid://12047486680"
 	else

src/Workspace/SignsInternal/NOTICE.server.lua

@@ -0,0 +1,6 @@
+--[[
+Copyright (C) 2023 The Winners Games - All Rights Reserved.
+Unauthorized without written permission from the author.
+Copying of this file, via any medium is strictly prohibited.
+Written by @TheWinners152 <[email protected]> from The Winners Games <https://www.roblox.com/groups/4973811/-->
+--]]

src/Workspace/SignsInternal/PluginGui/GuiObjectPart.lua

@@ -12,7 +12,7 @@ local Selection = game:GetService("Selection")
 GuiObjectPart = {}
 GuiObjectPart.__index = GuiObjectPart
 
-function GuiObjectPart.new(label: GuiObject, lightInfluence: number, alwaysOnTop: boolean, autoLocalize: boolean)
+function GuiObjectPart.new(label: GuiObject, lightInfluence: number?, alwaysOnTop: boolean?, autoLocalize: boolean?)
 	local self = {}
 	setmetatable(self, GuiObjectPart)
 
@@ -24,7 +24,7 @@ function GuiObjectPart.new(label: GuiObject, lightInfluence: number, alwaysOnTop
 	part.Parent = workspace
 	part.Transparency = 1
 	part.Size = Vector3.new(4, 4, 0)
-	part.Position = (camera.CFrame + camera.CFrame.LookVector * 15).Position
+	part.Position = (camera.CFrame + camera.CFrame.LookVector * 10).Position
 	local yCameraRotation = camera.CFrame.Rotation.Y
 	local yRotation = math.floor(yCameraRotation/90 + 0.5) * 90
 	part.Rotation = Vector3.new(0, yRotation, 0)

src/Workspace/SignsInternal/PluginGui/LineJoinMode.lua

@@ -0,0 +1,18 @@
+local choices = {
+
+	{Id = "1",
+		Mode = Enum.LineJoinMode.Round,
+		Text = "Round",
+	},
+	{Id = "2",
+		Mode = Enum.LineJoinMode.Bevel,
+		Text = "Bevel",
+	},
+	{Id = "3",
+		Mode = Enum.LineJoinMode.Miter,
+		Text = "Miter",
+	},
+
+}
+
+return choices

src/Workspace/SignsInternal/PluginGui/init.lua

@@ -18,6 +18,7 @@ local VerticallyScalingListFrame = require(targetFolder.VerticallyScalingListFra
 local Color = require(script.Color)
 local FontFace = require(script.FontFace)
 local GuiObjectPart = require(script.GuiObjectPart)
+local LineJoinMode = require(script.LineJoinMode)
 
 local PluginGui = {}
 
@@ -110,14 +111,14 @@ function PluginGui:newPluginGui(widgetGui)
 	)
 	wrappedCheckbox:GetFrame().Parent = textCollapse:GetContentsFrame()
 
-	local colorTextChoice = LabeledMultiChoice.new( -- Another hacky way to display color.
+	local colorTextChoice = LabeledMultiChoice.new(
 		"colorSelection", -- name suffix of gui object
 		"Text Color", -- title text of the multi choice
 		Color, -- choices array
-		11 -- the starting index of the selection (in this case choice 1)
+		11 -- the starting index of the selection
 	)
-	if settings().Studio.Theme == settings().Studio:GetAvailableThemes()[2] then
-		fontTextChoice:SetSelectedIndex(1)
+	if (GuiUtilities:ShouldUseIconsForDarkerBackgrounds()) then
+		colorTextChoice:SetSelectedIndex(1)
 	end
 	colorTextChoice:GetFrame().Parent = textCollapse:GetContentsFrame()
 
@@ -141,35 +142,62 @@ function PluginGui:newPluginGui(widgetGui)
 		"fontTextChoice", -- name suffix of gui object
 		"Font Face", -- title text of the multi choice
 		FontFace, -- choices array
-		32 -- the starting index of the selection (in this case choice 1)
+		32 -- the starting index of the selection
 	)
 	fontTextChoice:GetFrame().Parent = textCollapse:GetContentsFrame()
 
 	local strokeCollapse = CollapsibleTitledSection.new( -- Fonts collapse
 		"strokeCollapse", -- name suffix of the gui object
-		"Text Stroke", -- the text displayed beside the collapsible arrow
+		"Enabled", -- the text displayed beside the collapsible arrow
 		true, -- have the content frame auto-update its size?
 		true, -- minimizable?
 		true -- minimized by default?
 	)
 	listFrame:AddChild(strokeCollapse:GetSectionFrame()) -- add child to expanding VerticallyScalingListFrame
 
+	local strokeCheckbox = LabeledCheckbox.new(
+		"strokeCheckbox", -- name suffix of gui object
+		"Stroke", -- text beside the checkbox
+		false, -- initial value
+		false -- initially disabled?
+	)
+	strokeCheckbox:GetFrame().Parent = strokeCollapse:GetContentsFrame()
+
+	local colorStrokeChoice = LabeledMultiChoice.new(
+		"colorStrokeChoice", -- name suffix of gui object
+		"Color", -- title text of the multi choice
+		Color, -- choices array
+		11 -- the starting index of the selection
+	)
+	if GuiUtilities:ShouldUseIconsForDarkerBackgrounds() == true then
+		colorStrokeChoice:SetSelectedIndex(11)
+	end
+	colorStrokeChoice:GetFrame().Parent = strokeCollapse:GetContentsFrame()
+
+	local joinStrokeChoice = LabeledMultiChoice.new(
+		"joinStrokeChoice", -- name suffix of gui object
+		"Line Join Mode", -- title text of the multi choice
+		LineJoinMode, -- choices array
+		1 -- the starting index of the selection
+	)
+	joinStrokeChoice:GetFrame().Parent = strokeCollapse:GetContentsFrame()
+
+	local thicknessStrokeSlider = LabeledSlider.new( -- Size Slider
+		"thicknessStrokeSlider", -- name suffix of gui object
+		"Thickness", -- title text of the multi choice
+		11, -- how many intervals to split the slider into
+		2 -- the starting value of the slider
+	)
+	thicknessStrokeSlider:GetFrame().Parent = strokeCollapse:GetContentsFrame()
+
 	local transparencyStrokeSlider = LabeledSlider.new( -- Size Slider
 		"transparencyStrokeSlider", -- name suffix of gui object
 		"Transparency", -- title text of the multi choice
 		11, -- how many intervals to split the slider into
-		11 -- the starting value of the slider
+		1 -- the starting value of the slider
 	)
 	transparencyStrokeSlider:GetFrame().Parent = strokeCollapse:GetContentsFrame()
 
-	local colorStrokeChoice = LabeledMultiChoice.new( -- Another hacky way to display color.
-		"colorStrokeSelection", -- name suffix of gui object
-		"Stroke Color", -- title text of the multi choice
-		Color, -- choices array
-		11 -- the starting index of the selection (in this case choice 1)
-	)
-	colorStrokeChoice:GetFrame().Parent = strokeCollapse:GetContentsFrame()
-
 	local backgroundCollapse = CollapsibleTitledSection.new( -- Fonts collapse
 		"backgroundCollapse", -- name suffix of the gui object
 		"Background", -- the text displayed beside the collapsible arrow
@@ -187,11 +215,11 @@ function PluginGui:newPluginGui(widgetGui)
 	)
 	transparencyBackgroundSlider:GetFrame().Parent = backgroundCollapse:GetContentsFrame()
 
-	local colorBackgroundChoice = LabeledMultiChoice.new( -- Another hacky way to display color.
+	local colorBackgroundChoice = LabeledMultiChoice.new(
 		"colorBackgroundSelection", -- name suffix of gui object
 		"Background Color", -- title text of the multi choice
 		Color, -- choices array
-		1 -- the starting index of the selection (in this case choice 1)
+		1 -- the starting index of the selection
 	)
 	colorBackgroundChoice:GetFrame().Parent = backgroundCollapse:GetContentsFrame()
 
@@ -283,6 +311,7 @@ function PluginGui:newPluginGui(widgetGui)
 	italicCheckbox:SetValueChangedFunction(function(newValue)
 		CustomTextLabel:UpdateFontFaceItalic(newValue)
 	end)
+
 	colorTextChoice:SetValueChangedFunction(function(newIndex)
 		local color = Color[newIndex].Color
 		CustomTextLabel:UpdateTextColor3(color)
@@ -293,13 +322,26 @@ function PluginGui:newPluginGui(widgetGui)
 		CustomTextLabel:UpdateFontFace(font)
 	end)
 
-	transparencyStrokeSlider:SetValueChangedFunction(function(newValue)
-		CustomTextLabel:UpdateTextStrokeTransparency((newValue - 1) / 10)
+	strokeCheckbox:SetValueChangedFunction(function(newValue)
+		CustomTextLabel:UpdateStroke(newValue)
 	end)
 
 	colorStrokeChoice:SetValueChangedFunction(function(newIndex)
 		local color = Color[newIndex].Color
-		CustomTextLabel:UpdateTextStrokeColor3(color)
+		CustomTextLabel:UpdateStrokeColor(color)
+	end)
+
+	joinStrokeChoice:SetValueChangedFunction(function(newIndex)
+		local join = LineJoinMode[newIndex].Mode
+		CustomTextLabel:UpdateStrokeJoin(join)
+	end)
+
+	thicknessStrokeSlider:SetValueChangedFunction(function(newValue)
+		CustomTextLabel:UpdateStrokeThickness((newValue - 1))
+	end)
+
+	transparencyStrokeSlider:SetValueChangedFunction(function(newValue)
+		CustomTextLabel:UpdateStrokeTransparency((newValue - 1) / 10)
 	end)
 
 	transparencyBackgroundSlider:SetValueChangedFunction(function(newValue)

src/Workspace/SignsInternal/PluginInfo/init.client.lua

@@ -17,22 +17,22 @@ pluginToolbar:SetPlugin(plugin)
 local toolbar = pluginToolbar:CreateToolbar("Text Tools")
 
 -- Add a toolbar button
-local button = toolbar:CreateButton("Signs", "Hide/show the Signs Widget.", "rbxassetid://12060887019", "Signs")
+local button = toolbar:CreateButton("SignsInternal", "Hide/show the Signs Widget.", "rbxassetid://12168352133", "Signs Internal")
 button.ClickableWhenViewportHidden = true
 
 -- Create new widget GUI and name it
 local widget = plugin:CreateDockWidgetPluginGui("Signs", widgetInfo)
-widget.Title = "Signs"
-widget.Name = "Signs"
+widget.Title = "Signs Internal"
+widget.Name = "SignsInternal"
 
 -- Set CreateButton.Icon to match Studio theme
 local function setIcon()
 	if settings().Studio.Theme == settings().Studio:GetAvailableThemes()[1] then -- Light theme
-		button.Icon = "rbxassetid://12060897756"
+		button.Icon = "rbxassetid://12168355722"
 	elseif settings().Studio.Theme == settings().Studio:GetAvailableThemes()[2] then -- Dark theme
-		button.Icon = "rbxassetid://12060890851"
+		button.Icon = "rbxassetid://12168354157"
 	else
-		button.Icon = "rbxassetid://12060887019"
+		button.Icon = "rbxassetid://12168352133"
 		warn("Failed to get Studio Theme. Button Icon may have low visibility.")
 	end
 end

src/Workspace/SignsInternal/ReadMe.server.lua

@@ -84,9 +84,6 @@ function CustomTextButtonClass:_updateButtonVisual()
 	end
 end
 
--- Backwards compatibility (should be removed in the future)
--- CustomTextButtonClass.getButton = CustomTextButtonClass.GetButton
-
 function CustomTextButtonClass:GetButton()
 	return self._button
 end

src/Workspace/SignsInternal/StudioWidgets/CustomTextButton.lua

@@ -19,10 +19,8 @@ function CustomTextLabelClass.new(nameSuffix, height)
 	local label = Instance.new('TextLabel')
 	label.Text = "Preview"
 	label.BackgroundColor3 = Color3.fromRGB(255, 255, 255)
-	if settings().Studio.Theme == settings().Studio:GetAvailableThemes()[2] then
+	if (GuiUtilities:ShouldUseIconsForDarkerBackgrounds()) then
 		label.TextColor3 = Color3.fromRGB(255, 255, 255)
-	else
-		label.TextColor3 = Color3.fromRGB(0, 0, 0)
 	end
 	label.BackgroundTransparency = 1
 	label.Size = UDim2.new(1, 0, 1, 0)
@@ -31,6 +29,14 @@ function CustomTextLabelClass.new(nameSuffix, height)
 	label.TextWrapped = true
 	label.Parent = frame
 
+	local stroke = Instance.new("UIStroke")
+	stroke.Enabled = false
+	stroke.Color = Color3.fromRGB(255, 255, 255)
+	if (GuiUtilities:ShouldUseIconsForDarkerBackgrounds()) then
+		stroke.Color = Color3.fromRGB(0, 0, 0)
+	end
+	stroke.Parent = label
+
 	function CustomTextLabelClass:UpdateText(newValue: string)
 		label.Text = newValue
 	end
@@ -95,12 +101,32 @@ function CustomTextLabelClass.new(nameSuffix, height)
 		label.FontFace = newValue
 	end
 
-	function CustomTextLabelClass:UpdateTextStrokeTransparency(newValue: number)
-		label.TextStrokeTransparency = newValue
+	-- function CustomTextLabelClass:UpdateTextStrokeTransparency(newValue: number)
+	-- 	label.TextStrokeTransparency = newValue
+	-- end
+
+	-- function CustomTextLabelClass:UpdateTextStrokeColor3(newValue: Color3)
+	-- 	label.TextStrokeColor3 = newValue
+	-- end
+
+	function CustomTextLabelClass:UpdateStroke(newValue: boolean)
+		stroke.Enabled = newValue
+	end
+
+	function CustomTextLabelClass:UpdateStrokeTransparency(newValue: number)
+		stroke.Transparency = newValue
+	end
+
+	function CustomTextLabelClass:UpdateStrokeColor(newValue: Color3)
+		stroke.Color = newValue
+	end
+
+	function CustomTextLabelClass:UpdateStrokeJoin(newValue: Enum.LineJoinMode)
+		stroke.LineJoinMode = newValue
 	end
 
-	function CustomTextLabelClass:UpdateTextStrokeColor3(newValue: Color3)
-		label.TextStrokeColor3 = newValue
+	function CustomTextLabelClass:UpdateStrokeThickness(newValue: number)
+		stroke.Thickness = newValue
 	end
 
 	function CustomTextLabelClass:UpdateBackgroundTransparency(newValue: number)