TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1361 from GATTOUMIDE/miscEditor

Browse source 
Fixes camera speed slider and minor gui adjustments
This commit is contained in:
Brian Roberts 2025-01-22 09:47:51 -06:00 • committed by GitHub
commit 27eb3a567c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorToolbar.ed.gui
View file

@ -8,7 +8,7 @@ $guiContent = new GuiControl(EWorldEditorToolbar, EditorGuiGroup) {
HorizSizing = "right"; HorizSizing = "right";
VertSizing = "bottom"; VertSizing = "bottom";
Position = "306 0"; Position = "306 0";
Extent = "600" SPC getWord(EditorGuiToolbar.extent, 1) -2; Extent = "600" SPC getWord(EditorGuiToolbar.extent, 1) -10;
MinExtent = "8 2"; MinExtent = "8 2";
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
@ -24,7 +24,7 @@ $guiContent = new GuiControl(EWorldEditorToolbar, EditorGuiGroup) {
Profile = "ToolsMenubarProfile"; Profile = "ToolsMenubarProfile";
HorizSizing = "width"; HorizSizing = "width";
VertSizing = "bottom"; VertSizing = "bottom";
Position = "0 0"; Position = "3 0";
Extent = "190 31"; Extent = "190 31";
MinExtent = "16 16"; MinExtent = "16 16";
canSave = "1"; canSave = "1";
@ -73,7 +73,7 @@ $guiContent = new GuiControl(EWorldEditorToolbar, EditorGuiGroup) {
horizSizing = "right"; horizSizing = "right";
vertSizing = "bottom"; vertSizing = "bottom";
position = "37 7"; position = "37 7";
extent = "77 16"; extent = "95 16";
minExtent = "8 8"; minExtent = "8 8";
visible = "1"; visible = "1";
text = " World Settings"; text = " World Settings";
@ -201,8 +201,8 @@ $guiContent = new GuiControl(EWorldEditorToolbar, EditorGuiGroup) {
Profile = "ToolsGuiTransparentProfile"; Profile = "ToolsGuiTransparentProfile";
HorizSizing = "right"; HorizSizing = "right";
VertSizing = "bottom"; VertSizing = "bottom";
position = "178 5"; position = "261 5";
Extent = "56 22"; Extent = "65 22";
MinExtent = "8 2"; MinExtent = "8 2";
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
@ -215,9 +215,9 @@ $guiContent = new GuiControl(EWorldEditorToolbar, EditorGuiGroup) {
HorizSizing = "right"; HorizSizing = "right";
profile="ToolsGuiNumericDropSliderTextProfile"; profile="ToolsGuiNumericDropSliderTextProfile";
VertSizing = "bottom"; VertSizing = "bottom";
position = "0 2"; position = "0 4";
Extent = "42 16"; Extent = "32 17";
MinExtent = "8 16"; MinExtent = "8 17";
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
AltCommand = "EWorldEditor.setSoftSnapSize( $ThisControl.getText() ); EWorldEditor.syncGui();"; AltCommand = "EWorldEditor.setSoftSnapSize( $ThisControl.getText() ); EWorldEditor.syncGui();";
@ -237,7 +237,7 @@ $guiContent = new GuiControl(EWorldEditorToolbar, EditorGuiGroup) {
Profile = "ToolsGuiDefaultProfile"; Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right"; HorizSizing = "right";
VertSizing = "bottom"; VertSizing = "bottom";
Position = "34 2"; Position = "31 3";
Extent = "18 18"; Extent = "18 18";
MinExtent = "8 2"; MinExtent = "8 2";
canSave = "1"; canSave = "1";

14
Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript
View file

@ -2596,13 +2596,13 @@ function EWorldEditor::syncToolPalette( %this )
switch$ ( GlobalGizmoProfile.mode ) switch$ ( GlobalGizmoProfile.mode )
{ {
case "None": case "None":
EWorldEditorNoneModeBtn.performClick(); EWorldEditorNoneModeBtn::onClick();
case "Move": case "Move":
EWorldEditorMoveModeBtn.performClick(); EWorldEditorMoveModeBtn::onClick();
case "Rotate": case "Rotate":
EWorldEditorRotateModeBtn.performClick(); EWorldEditorRotateModeBtn::onClick();
case "Scale": case "Scale":
EWorldEditorScaleModeBtn.performClick(); EWorldEditorScaleModeBtn::onClick();
} }
} }
@ -3325,10 +3325,10 @@ function TerrainSetHeightSliderCtrlContainer::onWake(%this)
} }
//------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------
function CameraSpeedDropdownCtrlContainer::onWake(%this) function CameraSpeedDropdownContainer::onWake(%this)
{ {
%this-->slider.setValue(CameraSpeedDropdownContainer-->textEdit.getText()); %this-->slider.setValue(CameraSpeedDropdownCtrlContainer-->textEdit.getText());
%pos = CameraSpeedDropdownContainer.getGlobalPosition(); %pos = CameraSpeedDropdownCtrlContainer.getGlobalPosition();
%this-->slider.setPositionGlobal(%pos.x, %pos.y + 25); %this-->slider.setPositionGlobal(%pos.x, %pos.y + 25);
} }