Goodbye, 🚲 !

Removed some bicycles ++Optimization
devlephant · Feb 15, 2019 · 1541653 · 1541653
1 parent c8ae7ee
commit 1541653
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/soulEngine.exe b/soulEngine.exe
diff --git a/system/design/components.php b/system/design/components.php
@@ -558,7 +558,9 @@ function convertReturnType($class, $method, $type)
 	function get_sorted_methods($class)
 	{
 		$res = array();
-		$methods = gui_class_methodList($class);
+
+		$methods = gui_class_isset($class)?gui_class_methodList($class):include( dirname(__FILE__)."/components/methods/$class.php");
+
 		if( empty($methods) ) return $res;
 		foreach( $methods as $method_name=>$parameters )
 		{
@@ -585,10 +587,6 @@ function get_sorted_methods($class)
 			$componentEvents[$classname]	= $e;
 		*/
 
-		$m = get_sorted_methods($classname);
-		if( !empty($m) )
-			$componentMethods[strtolower($classname)]	= $m;
-
 	}
 
 
@@ -602,11 +600,6 @@ function get_sorted_methods($class)
 		$componentEvents[basenameNoExt($file)] = include($dir_n . '/components/events/' . $file);
 	}
 
-	$files = findFiles($dir_n . '/components/methods/','php');
-	foreach ($files as $file){
-		$componentMethods[strtolower(basenameNoExt($file))] = include($dir_n . '/components/methods/' . $file);
-	}
-
     $files = findFiles($dir_n . '/components/modifers/','php');
     foreach ($files as $file){
         require($dir_n . '/components/modifers/' . $file);
@@ -688,7 +681,6 @@ function get_sorted_methods($class)
         myVars::set2($cp,'_componentPanel');
         myVars::set2($componentProps,'componentProps');
         myVars::set2($componentEvents,'componentEvents');
-        myVars::set2($componentMethods,'componentMethods');
 
         $_winControls[] = 'TTabSheet';
         myVars::set2($_winControls,'_winControls');
diff --git a/system/models/properties.php b/system/models/properties.php
@@ -1246,7 +1246,7 @@ public function _generateClass($class){
 
 
         if (!isset($this->panels[$class])){
-			$theme = DOC_ROOT . 'images/btns/' . myOptions::get('prefs','studio_theme', 'light'); //#ADDOPT;
+			//$theme = DOC_ROOT . 'images/btns/' . myOptions::get('prefs','studio_theme', 'light'); //#ADDOPT;
 
             $panel = new TNextInspector( $fmMain );
             $panel->parent = c('fmPropsAndEvents->tabProps');
@@ -1256,8 +1256,8 @@ public function _generateClass($class){
             $panel->HighlightTextColor = 0xC1FFFF;
             $panel->onVSEdit = 'myProperties::VSEdit';
             $panel->onVSToolBarClick = 'myProperties::VSBarClick';
-			$panel->ExpandGlyph->loadFromFile("{$theme}/pp_collapsed.bmp");
-			$panel->CollapseGlyph->loadFromFile("{$theme}/pp_expanded.bmp");
+			//$panel->ExpandGlyph->loadFromFile("{$theme}/pp_collapsed.bmp");
+			//$panel->CollapseGlyph->loadFromFile("{$theme}/pp_expanded.bmp");
 			$panel->ButtonsStyle = 1; //btCustom
 			//gui_propSet($panel->self, 'AppearanceOptions', '[]');
 			gui_propSet($panel->self, 'Color', clWindow);
@@ -1408,8 +1408,8 @@ static function getPropertiesInfo($class){
     static function getMethodsInfo($class){
 
         global $componentMethods;
-        
-        return (array)$componentMethods[strtolower($class)];
+
+        return (array) get_sorted_methods($class);
     }
 
     static function fixSplitterMoved($self){