TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1635 from Azaezel/alpha41/inspectorAugs3
Some checks failed
Linux Build / ${{matrix.config.name}} (map[build_type:Release cc:gcc cxx:g++ generator:Ninja name:Ubuntu Latest GCC]) (push) Has been cancelled
Details
MacOSX Build / ${{matrix.config.name}} (map[build_type:Release cc:clang cxx:clang++ generator:Ninja name:MacOSX Latest Clang]) (push) Has been cancelled
Details
Windows Build / ${{matrix.config.name}} (map[build_type:Release cc:cl cxx:cl environment_script:C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat generator:Visual Studio 17 2022 name:Windows Latest MSVC]) (push) Has been cancelled
Details

Browse source 
add text selection to tab cycling
This commit is contained in:
Brian Roberts 2025-12-23 12:36:19 -06:00 committed by GitHub
parent a181f488b2 d8f65920f5
commit c78b60b5e8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Engine/source/gui/editor/guiInspectorTypes.cpp
View file

@ -1986,13 +1986,13 @@ void GuiInspectorType2DValue::constructEditControlChildren(GuiControl* retCtrl,
retCtrl->addObject(mContainerY); retCtrl->addObject(mContainerY);
mCtrlX->setDataField(StringTable->insert("tabComplete"), NULL, "true"); mCtrlX->setDataField(StringTable->insert("tabComplete"), NULL, "true");
String tabCmdX = String::ToString("function %s::onTabComplete(){ %s.setFirstResponder();}", String tabCmdX = String::ToString("function %s::onTabComplete(){ %s.setFirstResponder(); %s.selectAllText(); }",
mCtrlX->getName(), mCtrlY->getName()); mCtrlX->getName(), mCtrlY->getName(), mCtrlY->getName());
Con::evaluatef(tabCmdX); Con::evaluatef(tabCmdX);
mCtrlY->setDataField(StringTable->insert("tabComplete"), NULL, "true"); mCtrlY->setDataField(StringTable->insert("tabComplete"), NULL, "true");
String tabCmdY = String::ToString("function %s::onTabComplete(){ %s.setFirstResponder();}", String tabCmdY = String::ToString("function %s::onTabComplete(){ %s.setFirstResponder(); %s.selectAllText(); }",
mCtrlY->getName(), mCtrlX->getName()); mCtrlY->getName(), mCtrlX->getName(), mCtrlX->getName());
Con::evaluatef(tabCmdY); Con::evaluatef(tabCmdY);
//retCtrl->addObject(mScriptValue); //retCtrl->addObject(mScriptValue);
} }
@ -2120,13 +2120,13 @@ void GuiInspectorType3DValue::constructEditControlChildren(GuiControl* retCtrl,
_registerEditControl(mContainerZ, "cz"); _registerEditControl(mContainerZ, "cz");
mCtrlY->setDataField(StringTable->insert("tabComplete"), NULL, "true"); mCtrlY->setDataField(StringTable->insert("tabComplete"), NULL, "true");
String tabCmdY = String::ToString("function %s::onTabComplete(){ %s.setFirstResponder();}", String tabCmdY = String::ToString("function %s::onTabComplete(){ %s.setFirstResponder(); %s.selectAllText(); }",
mCtrlY->getName(), mCtrlZ->getName()); mCtrlY->getName(), mCtrlZ->getName(), mCtrlZ->getName());
Con::evaluatef(tabCmdY); Con::evaluatef(tabCmdY);
mCtrlZ->setDataField(StringTable->insert("tabComplete"), NULL, "true"); mCtrlZ->setDataField(StringTable->insert("tabComplete"), NULL, "true");
String tabCmdZ = String::ToString("function %s::onTabComplete(){ %s.setFirstResponder();}", String tabCmdZ = String::ToString("function %s::onTabComplete(){ %s.setFirstResponder(); %s.selectAllText(); }",
mCtrlZ->getName(), mCtrlX->getName()); mCtrlZ->getName(), mCtrlX->getName(), mCtrlX->getName());
Con::evaluatef(tabCmdZ); Con::evaluatef(tabCmdZ);
retCtrl->addObject(mContainerZ); retCtrl->addObject(mContainerZ);

6
Engine/source/gui/editor/inspector/field.cpp
View file

@ -468,7 +468,8 @@ void GuiInspectorField::setWordData(const S32& wordIndex, const char* data, bool
// Fire callback single-object undo. // Fire callback single-object undo.
if (callbacks && !mField->flag.test(AbstractClassRep::FieldFlags::FIELD_ComponentInspectors)) if (callbacks && !mField->flag.test(AbstractClassRep::FieldFlags::FIELD_ComponentInspectors)
&& (dStrcmp(fieldData, newFieldData.end().c_str()) != 0))
Con::executef(mInspector, "onInspectorFieldModified", Con::executef(mInspector, "onInspectorFieldModified",
target->getIdString(), target->getIdString(),
mField->pFieldname, mField->pFieldname,
@ -603,7 +604,8 @@ void GuiInspectorField::setData( const char* data, bool callbacks )
// Fire callback single-object undo. // Fire callback single-object undo.
if( callbacks && !mField->flag.test(AbstractClassRep::FieldFlags::FIELD_ComponentInspectors) ) if( callbacks && !mField->flag.test(AbstractClassRep::FieldFlags::FIELD_ComponentInspectors)
&& (dStrcmp(oldValue.c_str(), newValue.c_str()) != 0))
Con::executef( mInspector, "onInspectorFieldModified", Con::executef( mInspector, "onInspectorFieldModified",
target->getIdString(), target->getIdString(),
mField->pFieldname, mField->pFieldname,

28
Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript
View file

@ -1031,8 +1031,8 @@ function MaterialEditorGui::guiSync( %this )
function MaterialEditorGui::deArrayFieldsInRollout(%this, %rollout, %index) function MaterialEditorGui::deArrayFieldsInRollout(%this, %rollout, %index)
{ {
echo("===================================="); //echo("====================================");
echo("Processing group for array index: " @ %index); //echo("Processing group for array index: " @ %index);
%stack = %rollout.getObject(0); %stack = %rollout.getObject(0);
%count = %stack.getCount(); %count = %stack.getCount();
@ -1046,38 +1046,38 @@ function MaterialEditorGui::deArrayFieldsInRollout(%this, %rollout, %index)
{ {
%fieldArrayGroup = %stack.getObject(%i); %fieldArrayGroup = %stack.getObject(%i);
%fieldArrayStack = %fieldArrayGroup.getObject(0); %fieldArrayStack = %fieldArrayGroup.getObject(0);
echo("Field Array: " @ %fieldArrayGroup.caption @ ", ID: " @ %fieldArrayGroup @ ", type: " @ %fieldArrayGroup.getClassName()); //echo("Field Array: " @ %fieldArrayGroup.caption @ ", ID: " @ %fieldArrayGroup @ ", type: " @ %fieldArrayGroup.getClassName());
%fieldCaption = %fieldArrayGroup.caption; %fieldCaption = %fieldArrayGroup.caption;
%newFieldCaption = getSubStr(%fieldCaption, 0, strLen(%fieldCaption) - 4); %newFieldCaption = getSubStr(%fieldCaption, 0, strLen(%fieldCaption) - 4);
echo(" New Caption: " @ %newFieldCaption); //echo(" New Caption: " @ %newFieldCaption);
%curLayerField = %fieldArrayStack.getObject(%index); %curLayerField = %fieldArrayStack.getObject(%index);
echo(" Field Obj for cur layer: " @ %curLayerField); //echo(" Field Obj for cur layer: " @ %curLayerField);
%stack.add(%curLayerField); %stack.add(%curLayerField);
%curLayerField.setCaption(%newFieldCaption); %curLayerField.setCaption(%newFieldCaption);
deArrayObjects.add(%stack, %fieldArrayGroup); deArrayObjects.add(%stack, %fieldArrayGroup);
echo(" ---"); //echo(" ---");
} }
echo("Cleaning up field array groups"); //echo("Cleaning up field array groups");
for(%i=0; %i < deArrayObjects.count(); %i++) for(%i=0; %i < deArrayObjects.count(); %i++)
{ {
%group = deArrayObjects.getKey(%i); %group = deArrayObjects.getKey(%i);
%obj = deArrayObjects.getValue(%i); %obj = deArrayObjects.getValue(%i);
echo("Removing: " @ %obj @ " from group: " @ %group); //echo("Removing: " @ %obj @ " from group: " @ %group);
%group.remove(%obj); %group.remove(%obj);
} }
echo("===================================="); //echo("====================================");
deArrayObjects.empty(); deArrayObjects.empty();
} }
@ -1552,7 +1552,7 @@ function MaterialEditorGui::save( %this )
if(MaterialEditorGui.currentMaterialAsset !$= "") if(MaterialEditorGui.currentMaterialAsset !$= "")
{ {
echo("Attempting to save material: " @ MaterialEditorGui.currentMaterialAsset); //echo("Attempting to save material: " @ MaterialEditorGui.currentMaterialAsset);
MaterialEditorGui.copyMaterials( materialEd_previewMaterial, notDirtyMaterial ); MaterialEditorGui.copyMaterials( materialEd_previewMaterial, notDirtyMaterial );
%assetDef = AssetDatabase.acquireAsset(MaterialEditorGui.currentMaterialAsset); %assetDef = AssetDatabase.acquireAsset(MaterialEditorGui.currentMaterialAsset);
@ -2031,7 +2031,7 @@ function MaterialEditorPropInspector::onPostInspectObject(%this, %obj)
function MaterialEditorPropInspector::saveScrollState(%this) function MaterialEditorPropInspector::saveScrollState(%this)
{ {
%this.scrollPos = %this.getScrollbar().getScrollPosition(); %this.scrollPos = %this.getScrollbar().getScrollPosition();
echo(%this.getName() @ "::saveScrollState" SPC %this.scrollPos); //echo(%this.getName() @ "::saveScrollState" SPC %this.scrollPos);
} }
function MaterialEditorPropInspector::loadScrollState(%this) function MaterialEditorPropInspector::loadScrollState(%this)
@ -2039,7 +2039,7 @@ function MaterialEditorPropInspector::loadScrollState(%this)
if (%this.scrollPos $= "") if (%this.scrollPos $= "")
return; return;
%this.getScrollbar().setScrollPosition(%this.scrollPos.x, %this.scrollPos.y); %this.getScrollbar().setScrollPosition(%this.scrollPos.x, %this.scrollPos.y);
echo(%this.getName() @ "::loadScrollState" SPC %this.scrollPos); //echo(%this.getName() @ "::loadScrollState" SPC %this.scrollPos);
} }
@ -2073,6 +2073,6 @@ function MaterialEditorPropInspector::loadCollapseState(%this)
function MaterialEditorPropInspector::onFieldRightClick(%this, %fieldCtrl) function MaterialEditorPropInspector::onFieldRightClick(%this, %fieldCtrl)
{ {
echo("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"); //echo("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
echo(%fieldCtrl.getFieldName()); //echo(%fieldCtrl.getFieldName());
} }