Skip to content

Commit 1541653

Browse files
author
Andrew Zenin
committed
Goodbye, 🚲 !
Removed some bicycles ++Optimization
1 parent c8ae7ee commit 1541653

File tree

3 files changed

+8
-16
lines changed

3 files changed

+8
-16
lines changed

soulEngine.exe

1 KB
Binary file not shown.

system/design/components.php

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,9 @@ function convertReturnType($class, $method, $type)
558558
function get_sorted_methods($class)
559559
{
560560
$res = array();
561-
$methods = gui_class_methodList($class);
561+
562+
$methods = gui_class_isset($class)?gui_class_methodList($class):include( dirname(__FILE__)."/components/methods/$class.php");
563+
562564
if( empty($methods) ) return $res;
563565
foreach( $methods as $method_name=>$parameters )
564566
{
@@ -585,10 +587,6 @@ function get_sorted_methods($class)
585587
$componentEvents[$classname] = $e;
586588
*/
587589

588-
$m = get_sorted_methods($classname);
589-
if( !empty($m) )
590-
$componentMethods[strtolower($classname)] = $m;
591-
592590
}
593591

594592

@@ -602,11 +600,6 @@ function get_sorted_methods($class)
602600
$componentEvents[basenameNoExt($file)] = include($dir_n . '/components/events/' . $file);
603601
}
604602

605-
$files = findFiles($dir_n . '/components/methods/','php');
606-
foreach ($files as $file){
607-
$componentMethods[strtolower(basenameNoExt($file))] = include($dir_n . '/components/methods/' . $file);
608-
}
609-
610603
$files = findFiles($dir_n . '/components/modifers/','php');
611604
foreach ($files as $file){
612605
require($dir_n . '/components/modifers/' . $file);
@@ -688,7 +681,6 @@ function get_sorted_methods($class)
688681
myVars::set2($cp,'_componentPanel');
689682
myVars::set2($componentProps,'componentProps');
690683
myVars::set2($componentEvents,'componentEvents');
691-
myVars::set2($componentMethods,'componentMethods');
692684

693685
$_winControls[] = 'TTabSheet';
694686
myVars::set2($_winControls,'_winControls');

system/models/properties.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1246,7 +1246,7 @@ public function _generateClass($class){
12461246

12471247

12481248
if (!isset($this->panels[$class])){
1249-
$theme = DOC_ROOT . 'images/btns/' . myOptions::get('prefs','studio_theme', 'light'); //#ADDOPT;
1249+
//$theme = DOC_ROOT . 'images/btns/' . myOptions::get('prefs','studio_theme', 'light'); //#ADDOPT;
12501250

12511251
$panel = new TNextInspector( $fmMain );
12521252
$panel->parent = c('fmPropsAndEvents->tabProps');
@@ -1256,8 +1256,8 @@ public function _generateClass($class){
12561256
$panel->HighlightTextColor = 0xC1FFFF;
12571257
$panel->onVSEdit = 'myProperties::VSEdit';
12581258
$panel->onVSToolBarClick = 'myProperties::VSBarClick';
1259-
$panel->ExpandGlyph->loadFromFile("{$theme}/pp_collapsed.bmp");
1260-
$panel->CollapseGlyph->loadFromFile("{$theme}/pp_expanded.bmp");
1259+
//$panel->ExpandGlyph->loadFromFile("{$theme}/pp_collapsed.bmp");
1260+
//$panel->CollapseGlyph->loadFromFile("{$theme}/pp_expanded.bmp");
12611261
$panel->ButtonsStyle = 1; //btCustom
12621262
//gui_propSet($panel->self, 'AppearanceOptions', '[]');
12631263
gui_propSet($panel->self, 'Color', clWindow);
@@ -1408,8 +1408,8 @@ static function getPropertiesInfo($class){
14081408
static function getMethodsInfo($class){
14091409

14101410
global $componentMethods;
1411-
1412-
return (array)$componentMethods[strtolower($class)];
1411+
1412+
return (array) get_sorted_methods($class);
14131413
}
14141414

14151415
static function fixSplitterMoved($self){

0 commit comments

Comments
 (0)