mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-01-19 20:24:49 +00:00
Merge pull request #1361 from GATTOUMIDE/miscEditor
Fixes camera speed slider and minor gui adjustments
This commit is contained in:
commit
27eb3a567c
|
|
@ -8,7 +8,7 @@ $guiContent = new GuiControl(EWorldEditorToolbar, EditorGuiGroup) {
|
|||
HorizSizing = "right";
|
||||
VertSizing = "bottom";
|
||||
Position = "306 0";
|
||||
Extent = "600" SPC getWord(EditorGuiToolbar.extent, 1) -2;
|
||||
Extent = "600" SPC getWord(EditorGuiToolbar.extent, 1) -10;
|
||||
MinExtent = "8 2";
|
||||
canSave = "1";
|
||||
Visible = "1";
|
||||
|
|
@ -24,7 +24,7 @@ $guiContent = new GuiControl(EWorldEditorToolbar, EditorGuiGroup) {
|
|||
Profile = "ToolsMenubarProfile";
|
||||
HorizSizing = "width";
|
||||
VertSizing = "bottom";
|
||||
Position = "0 0";
|
||||
Position = "3 0";
|
||||
Extent = "190 31";
|
||||
MinExtent = "16 16";
|
||||
canSave = "1";
|
||||
|
|
@ -73,7 +73,7 @@ $guiContent = new GuiControl(EWorldEditorToolbar, EditorGuiGroup) {
|
|||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
position = "37 7";
|
||||
extent = "77 16";
|
||||
extent = "95 16";
|
||||
minExtent = "8 8";
|
||||
visible = "1";
|
||||
text = " World Settings";
|
||||
|
|
@ -201,8 +201,8 @@ $guiContent = new GuiControl(EWorldEditorToolbar, EditorGuiGroup) {
|
|||
Profile = "ToolsGuiTransparentProfile";
|
||||
HorizSizing = "right";
|
||||
VertSizing = "bottom";
|
||||
position = "178 5";
|
||||
Extent = "56 22";
|
||||
position = "261 5";
|
||||
Extent = "65 22";
|
||||
MinExtent = "8 2";
|
||||
canSave = "1";
|
||||
Visible = "1";
|
||||
|
|
@ -215,9 +215,9 @@ $guiContent = new GuiControl(EWorldEditorToolbar, EditorGuiGroup) {
|
|||
HorizSizing = "right";
|
||||
profile="ToolsGuiNumericDropSliderTextProfile";
|
||||
VertSizing = "bottom";
|
||||
position = "0 2";
|
||||
Extent = "42 16";
|
||||
MinExtent = "8 16";
|
||||
position = "0 4";
|
||||
Extent = "32 17";
|
||||
MinExtent = "8 17";
|
||||
canSave = "1";
|
||||
Visible = "1";
|
||||
AltCommand = "EWorldEditor.setSoftSnapSize( $ThisControl.getText() ); EWorldEditor.syncGui();";
|
||||
|
|
@ -237,7 +237,7 @@ $guiContent = new GuiControl(EWorldEditorToolbar, EditorGuiGroup) {
|
|||
Profile = "ToolsGuiDefaultProfile";
|
||||
HorizSizing = "right";
|
||||
VertSizing = "bottom";
|
||||
Position = "34 2";
|
||||
Position = "31 3";
|
||||
Extent = "18 18";
|
||||
MinExtent = "8 2";
|
||||
canSave = "1";
|
||||
|
|
|
|||
|
|
@ -2596,13 +2596,13 @@ function EWorldEditor::syncToolPalette( %this )
|
|||
switch$ ( GlobalGizmoProfile.mode )
|
||||
{
|
||||
case "None":
|
||||
EWorldEditorNoneModeBtn.performClick();
|
||||
EWorldEditorNoneModeBtn::onClick();
|
||||
case "Move":
|
||||
EWorldEditorMoveModeBtn.performClick();
|
||||
EWorldEditorMoveModeBtn::onClick();
|
||||
case "Rotate":
|
||||
EWorldEditorRotateModeBtn.performClick();
|
||||
EWorldEditorRotateModeBtn::onClick();
|
||||
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());
|
||||
%pos = CameraSpeedDropdownContainer.getGlobalPosition();
|
||||
%this-->slider.setValue(CameraSpeedDropdownCtrlContainer-->textEdit.getText());
|
||||
%pos = CameraSpeedDropdownCtrlContainer.getGlobalPosition();
|
||||
%this-->slider.setPositionGlobal(%pos.x, %pos.y + 25);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue