epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated scale sliders to accout for the new AssetBrowser layout

Browse Source
This commit is contained in:
penev92
2022-01-06 03:07:34 +02:00
committed by Matthias Mailänder
parent b6b417d42f
commit 495faea96b
3 changed files with 49 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
View File

@@ -287,8 +287,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ {
spriteScaleSlider.OnChange += x => spriteScale = x; spriteScaleSlider.OnChange += x => spriteScale = x;
spriteScaleSlider.GetValue = () => spriteScale; spriteScaleSlider.GetValue = () => spriteScale;
spriteScaleSlider.IsVisible = () => !isVideoLoaded && currentSoundFormat == null; spriteScaleSlider.IsVisible = () => currentSprites != null;
panel.GetOrNull<LabelWidget>("SPRITE_SCALE").IsVisible = () => !isVideoLoaded && currentSoundFormat == null; panel.GetOrNull<LabelWidget>("SPRITE_SCALE").IsVisible = () => currentSprites != null;
} }
var voxelContainer = panel.GetOrNull("VOXEL_SELECTOR"); var voxelContainer = panel.GetOrNull("VOXEL_SELECTOR");
@@ -336,6 +336,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ {
modelScaleSlider.OnChange += x => modelScale = x; modelScaleSlider.OnChange += x => modelScale = x;
modelScaleSlider.GetValue = () => modelScale; modelScaleSlider.GetValue = () => modelScale;
modelScaleSlider.IsVisible = () => currentVoxel != null;
panel.GetOrNull<LabelWidget>("MODEL_SCALE").IsVisible = () => currentVoxel != null;
} }
var assetBrowserModData = modData.Manifest.Get<AssetBrowser>(); var assetBrowserModData = modData.Manifest.Get<AssetBrowser>();

30
mods/cnc/chrome/assetbrowser.yaml
View File

@@ -67,6 +67,21 @@ Container@ASSETBROWSER_PANEL:
Width: 195 Width: 195
Height: 25 Height: 25
Type: Filename Type: Filename
Label@SPRITE_SCALE:
X: PARENT_RIGHT - WIDTH - 440
Y: 31
Width: 40
Height: 25
Font: Bold
Align: Left
Text: Scale:
Slider@SPRITE_SCALE_SLIDER:
X: PARENT_RIGHT - WIDTH - 330
Y: 35
Width: 100
Height: 20
MinimumValue: 0.5
MaximumValue: 4
Label@PALETTE_DESC: Label@PALETTE_DESC:
X: PARENT_RIGHT - WIDTH - 270 X: PARENT_RIGHT - WIDTH - 270
Y: 31 Y: 31
@@ -195,21 +210,6 @@ Container@ASSETBROWSER_PANEL:
Height: 25 Height: 25
Font: TinyBold Font: TinyBold
Align: Left Align: Left
Label@SPRITE_SCALE:
X: 0
Y: 32
Width: 40
Height: 25
Font: TinyBold
Align: Left
Text: Scale
Slider@SPRITE_SCALE_SLIDER:
X: 35
Y: 35
Width: 100
Height: 20
MinimumValue: 0.5
MaximumValue: 4
Button@CLOSE_BUTTON: Button@CLOSE_BUTTON:
Key: escape Key: escape
Y: PARENT_BOTTOM - 1 Y: PARENT_BOTTOM - 1

60
mods/common/chrome/assetbrowser.yaml
View File

@@ -62,6 +62,36 @@ Background@ASSETBROWSER_PANEL:
Width: 195 Width: 195
Height: 25 Height: 25
Type: Filename Type: Filename
Label@SPRITE_SCALE:
X: PARENT_RIGHT - WIDTH - 440
Y: 60
Width: 40
Height: 25
Font: Bold
Align: Left
Text: Scale:
Slider@SPRITE_SCALE_SLIDER:
X: PARENT_RIGHT - WIDTH - 330
Y: 62
Width: 100
Height: 20
MinimumValue: 0.5
MaximumValue: 4
Label@MODEL_SCALE:
X: PARENT_RIGHT - WIDTH - 440
Y: 60
Width: 40
Height: 25
Font: Bold
Align: Left
Text: Scale:
Slider@MODEL_SCALE_SLIDER:
X: PARENT_RIGHT - WIDTH - 330
Y: 62
Width: 100
Height: 20
MinimumValue: 10
MaximumValue: 64
Label@PALETTE_DESC: Label@PALETTE_DESC:
X: PARENT_RIGHT - WIDTH - 270 X: PARENT_RIGHT - WIDTH - 270
Y: 60 Y: 60
@@ -185,21 +215,6 @@ Background@ASSETBROWSER_PANEL:
Height: 25 Height: 25
Font: TinyBold Font: TinyBold
Align: Left Align: Left
Label@SPRITE_SCALE:
X: 0
Y: 30
Width: 40
Height: 25
Font: TinyBold
Align: Left
Text: Scale
Slider@SPRITE_SCALE_SLIDER:
X: 35
Y: 32
Width: 100
Height: 20
MinimumValue: 0.5
MaximumValue: 4
Container@VOXEL_SELECTOR: Container@VOXEL_SELECTOR:
X: 226 X: 226
Y: PARENT_BOTTOM - 75 Y: PARENT_BOTTOM - 75
@@ -248,21 +263,6 @@ Background@ASSETBROWSER_PANEL:
Height: 20 Height: 20
MinimumValue: 1 MinimumValue: 1
MaximumValue: 1023 MaximumValue: 1023
Label@MODEL_SCALE:
X: 150
Y: 30
Width: 40
Height: 25
Font: TinyBold
Align: Left
Text: Scale
Slider@MODEL_SCALE_SLIDER:
X: 190
Y: 32
Width: 100
Height: 20
MinimumValue: 10
MaximumValue: 64
Button@CLOSE_BUTTON: Button@CLOSE_BUTTON:
Key: escape Key: escape
X: PARENT_RIGHT - 180 X: PARENT_RIGHT - 180