Move derma icon browser to a more sensible place

So we don't have to worry about forcing clients to download a pointless file that returns on execution
Facepunch · Apr 19, 2023 · cb7ab3c · cb7ab3c
1 parent d089448
commit cb7ab3c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/garrysmod/lua/derma/init.lua b/garrysmod/lua/derma/init.lua
@@ -50,7 +50,6 @@ include( "derma_menus.lua" )
 include( "derma_animation.lua" )
 include( "derma_utils.lua" )
 include( "derma_gwen.lua" )
-include( "derma_icon_browser.lua" )
 
 function Derma_Hook( panel, functionname, hookname, typename )
 

diff --git a/garrysmod/lua/includes/extensions/string.lua b/garrysmod/lua/includes/extensions/string.lua
@@ -18,7 +18,6 @@ function string.ToTable( input )
 	return tbl
 end
 
-
 --[[---------------------------------------------------------
 	Name: string.JavascriptSafe( string )
 	Desc: Takes a string and escapes it for insertion in to a JavaScript string

diff --git a/garrysmod/lua/includes/init_menu.lua b/garrysmod/lua/includes/init_menu.lua
@@ -42,3 +42,5 @@ include( "util/javascript_util.lua" )
 include( "util/tooltips.lua" )
 
 require( "notification" )
+
+include( "menu/derma_icon_browser.lua" )
diff --git a/garrysmod/lua/derma/derma_icon_browser.lua → garrysmod/lua/menu/derma_icon_browser.lua b/garrysmod/lua/derma/derma_icon_browser.lua → garrysmod/lua/menu/derma_icon_browser.lua
@@ -1,5 +1,3 @@
--- Keep the icon browser as part of the menu UI - convenient for quickly pressing ESC to open/close icon browser once derma_icon_browser has been run
-if not MENU_DLL then return end
 
 function Derma_OpenIconBrowser()
 	-- Because the icon browser will be part of the menu, activate the menu so that it definitely shows up otherwise a derma_icon_browser bind does nothing