Skip to content

Commit bdc517b

Browse files
authored
feat: text_entry enhancements (#58)
1 parent b75d083 commit bdc517b

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

lua/pixelui/elements/cl_text_entry.lua

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,13 @@ end
3939
function PANEL:Paint(w, h)
4040
if not self:IsEnabled() then
4141
PIXEL.DrawRoundedBox(PIXEL.Scale(4), 0, 0, w, h, self.DisabledCol)
42-
PIXEL.DrawSimpleText("Disabled", "UI.TextEntry", PIXEL.Scale(4), h / 2, PIXEL.Colors.SecondaryText, TEXT_ALIGN_LEFT, TEXT_ALIGN_CENTER)
42+
PIXEL.DrawSimpleText("Disabled", self:GetFont(), PIXEL.Scale(4), h / 2, PIXEL.Colors.SecondaryText, TEXT_ALIGN_LEFT, TEXT_ALIGN_CENTER)
4343
return
4444
end
4545

4646
if self:GetValue() == "" then
47-
PIXEL.DrawSimpleText(self:GetPlaceholderText() or "", "UI.TextEntry", PIXEL.Scale(10), h / 2, self.PlaceholderTextCol, TEXT_ALIGN_LEFT, TEXT_ALIGN_CENTER)
47+
local placeholderY = self:IsMultiline() and draw.GetFontHeight(self:GetFont()) or h / 2
48+
PIXEL.DrawSimpleText(self:GetPlaceholderText() or "", self:GetFont(), PIXEL.Scale(10), placeholderY, self.PlaceholderTextCol, TEXT_ALIGN_LEFT, TEXT_ALIGN_CENTER)
4849
end
4950

5051
local outlineThickness = PIXEL.Scale(1)
@@ -97,6 +98,9 @@ function PANEL:SetTabbingDisabled(disabled) self.TextEntry:SetTabbingDisabled(di
9798
function PANEL:GetPlaceholderText() return self.TextEntry:GetPlaceholderText() end
9899
function PANEL:SetPlaceholderText(text) self.TextEntry:SetPlaceholderText(text) end
99100

101+
function PANEL:GetFont() return self.TextEntry:GetFont() end
102+
function PANEL:SetFont(font) self.TextEntry:SetFontInternal(font) end
103+
100104
function PANEL:GetInt() return self.TextEntry:GetInt() end
101105
function PANEL:GetFloat() return self.TextEntry:GetFloat() end
102106

0 commit comments

Comments
 (0)