Skip to content

Improved constant value rendering, and editing #3544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
llysdal merged 3 commits into from
Feb 28, 2026
Merged

Improved constant value rendering, and editing #3544

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8cc370
Improved constant value rendering, and editing
llysdal Feb 28, 2026
77af620
Fixed constant value copy/paste error
llysdal Feb 28, 2026
8fb75d5
Used color_black instead of locally defined black
llysdal Feb 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 27 additions & 11 deletions lua/wire/client/node_editor/nodeeditor.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1298,7 +1298,7 @@ function Editor:PaintGate(nodeId, node, gate)
surface.DrawText(node.ioName)
-- Constant
elseif node.value then
local s = tostring(node.value)
local s = util.TypeToString(node.value)
local tx, ty = surface.GetTextSize(s)
surface.SetTextPos(x - tx / 2, y - ty / 2 + size / 1.2)
surface.DrawText(s)
Expand Down Expand Up @@ -1970,6 +1970,7 @@ function Editor:CopyNodes(nodeIds)
nodeCopy.ioName = node.ioName
elseif gate.isConstant then
nodeCopy.value = node.value
nodeCopy.valueAsString = node.valueAsString
end
elseif node.visual then
nodeCopy.visual = node.visual
Expand Down Expand Up @@ -2033,6 +2034,7 @@ function Editor:PasteNodes(x, y)
nodeCopy.ioName = copyNode.ioName
elseif gate.isConstant then
nodeCopy.value = copyNode.value
nodeCopy.valueAsString = copyNode.valueAsString
end
elseif copyNode.visual then
nodeCopy.visual = copyNode.visual
Expand Down Expand Up @@ -2612,6 +2614,7 @@ function Editor:CreateConstantSetWindow()
self.ConstantSetNormal:Dock(BOTTOM)
self.ConstantSetNormal:SetSize(175, 20)
self.ConstantSetNormal:SetMinMax(-10 ^ 100, 10 ^ 100)
self.ConstantSetNormal:SetDecimals(6)
self.ConstantSetNormal:SetVisible(false)
self.ConstantSetString = vgui.Create("DTextEntry", pnl)
self.ConstantSetString:Dock(BOTTOM)
Expand Down Expand Up @@ -2639,60 +2642,73 @@ function Editor:OpenConstantSetWindow(node, x, y, type)
self.ConstantSetNormal.OnEnter = function () end
self.ConstantSetString:SetVisible(false)
self.ConstantSetString.OnEnter = function () end
self.ConstantSetString.OnChange = function () end
self.ConstantSetString:SetValue("")
self.ConstantSetWindow:SetVisible(true)
self.ConstantSetWindow:MakePopup() -- This will move it above the FPGA editor if it is behind it.
self.ForceDrawCursor = true

local black = Color(0, 0, 0, 255)
Copy link
Copy Markdown
Contributor

@Astralcircle Astralcircle Feb 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can just use color_black global

local invalidColor = Color(255, 0, 50, 255)
self.ConstantSetString:SetTextColor(black)

local px, py = self:GetParent():GetPos()
self.ConstantSetWindow:SetPos(px + x + 80, py + y + 30)

if type == "NORMAL" then
self.ConstantSetNormal:SetVisible(true)
self.ConstantSetNormal:SetValue(node.value)
self.ConstantSetNormal:RequestFocus()
local func = function(pnl)
self.ConstantSetNormal.OnEnter = function(pnl)
node.value = pnl:GetValue()
pnl:SetVisible(false)
pnl:GetParent():Close()
end
self.ConstantSetNormal.OnEnter = func
elseif type == "STRING" then
self.ConstantSetString:SetVisible(true)
self.ConstantSetString:SetText(node.value)
self.ConstantSetString:RequestFocus()
local func = function(pnl)
self.ConstantSetString.OnEnter = function(pnl)
node.value = pnl:GetValue()
pnl:SetVisible(false)
pnl:GetParent():Close()
end
self.ConstantSetString.OnEnter = func
elseif type == "VECTOR" then
self.ConstantSetString:SetVisible(true)
self.ConstantSetString:SetText(node.value.x .. ", " .. node.value.y .. ", " .. node.value.z)
self.ConstantSetString:SetText(node.valueAsString or (node.value.x .. ", " .. node.value.y .. ", " .. node.value.z))
self.ConstantSetString:RequestFocus()
local func = function(pnl)
self.ConstantSetString.OnEnter = function(pnl)
valid, x, y, z = validateVector(pnl:GetValue())
if valid then
node.value = Vector(x, y, z)
node.valueAsString = pnl:GetValue()
pnl:SetVisible(false)
pnl:GetParent():Close()
end
end
self.ConstantSetString.OnEnter = func
self.ConstantSetString.OnChange = function(pnl)
valid, _, _, _ = validateVector(pnl:GetValue())
if valid then pnl:SetTextColor(black)
else pnl:SetTextColor(invalidColor) end
end
elseif type == "ANGLE" then
self.ConstantSetString:SetVisible(true)
self.ConstantSetString:SetText(node.value.p .. ", " .. node.value.y .. ", " .. node.value.r)
self.ConstantSetString:SetText(node.valueAsString or (node.value.x .. ", " .. node.value.y .. ", " .. node.value.z))
self.ConstantSetString:RequestFocus()
local func = function(pnl)
self.ConstantSetString.OnEnter = function(pnl)
valid, p, y, r = validateVector(pnl:GetValue())
if valid then
node.value = Angle(p, y, r)
node.valueAsString = pnl:GetValue()
pnl:SetVisible(false)
pnl:GetParent():Close()
end
end
self.ConstantSetString.OnEnter = func
self.ConstantSetString.OnChange = function(pnl)
valid, _, _, _ = validateVector(pnl:GetValue())
if valid then pnl:SetTextColor(black)
else pnl:SetTextColor(invalidColor) end
end
end

local inputField = self.ConstantSetString
Expand Down
Loading