Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit d3bbfbf

Browse filesBrowse files
committed
Revert PR#2089
Causes regressions with spawnmenu help text and other issues
1 parent a413b41 commit d3bbfbf
Copy full SHA for d3bbfbf

File tree

Expand file treeCollapse file tree

1 file changed

+6
-12
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+6
-12
lines changed

‎garrysmod/lua/vgui/dlabel.lua

Copy file name to clipboardExpand all lines: garrysmod/lua/vgui/dlabel.lua
+6-12Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -136,26 +136,20 @@ function PANEL:ApplySchemeSettings()
136136

137137
end
138138

139-
function PANEL:PerformLayout()
140-
141-
self:ApplySchemeSettings()
139+
function PANEL:Think()
142140

143141
if ( self:GetAutoStretchVertical() ) then
142+
self:SizeToContentsY()
143+
end
144144

145-
local dockType = self:GetDock()
146-
147-
-- Auto stretch will layout infinitely with these dock types, so we'll ignore them
148-
if ( dockType != FILL && dockType != LEFT && dockType != RIGHT ) then
149-
150-
self:SizeToContentsY()
145+
end
151146

152-
end
147+
function PANEL:PerformLayout()
153148

154-
end
149+
self:ApplySchemeSettings()
155150

156151
end
157152

158-
159153
function PANEL:OnCursorEntered()
160154

161155
self:InvalidateLayout( true )

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.