diff --git a/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs index 73c62d0f53..bf5675b4c4 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs @@ -287,8 +287,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic { spriteScaleSlider.OnChange += x => spriteScale = x; spriteScaleSlider.GetValue = () => spriteScale; - spriteScaleSlider.IsVisible = () => !isVideoLoaded && currentSoundFormat == null; - panel.GetOrNull("SPRITE_SCALE").IsVisible = () => !isVideoLoaded && currentSoundFormat == null; + spriteScaleSlider.IsVisible = () => currentSprites != null; + panel.GetOrNull("SPRITE_SCALE").IsVisible = () => currentSprites != null; } var voxelContainer = panel.GetOrNull("VOXEL_SELECTOR"); @@ -336,6 +336,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic { modelScaleSlider.OnChange += x => modelScale = x; modelScaleSlider.GetValue = () => modelScale; + modelScaleSlider.IsVisible = () => currentVoxel != null; + panel.GetOrNull("MODEL_SCALE").IsVisible = () => currentVoxel != null; } var assetBrowserModData = modData.Manifest.Get(); diff --git a/mods/cnc/chrome/assetbrowser.yaml b/mods/cnc/chrome/assetbrowser.yaml index bf22757de8..dda44e6c6e 100644 --- a/mods/cnc/chrome/assetbrowser.yaml +++ b/mods/cnc/chrome/assetbrowser.yaml @@ -67,6 +67,21 @@ Container@ASSETBROWSER_PANEL: Width: 195 Height: 25 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: X: PARENT_RIGHT - WIDTH - 270 Y: 31 @@ -195,21 +210,6 @@ Container@ASSETBROWSER_PANEL: Height: 25 Font: TinyBold 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: Key: escape Y: PARENT_BOTTOM - 1 diff --git a/mods/common/chrome/assetbrowser.yaml b/mods/common/chrome/assetbrowser.yaml index 1852ec51a4..8686afbbb5 100644 --- a/mods/common/chrome/assetbrowser.yaml +++ b/mods/common/chrome/assetbrowser.yaml @@ -62,6 +62,36 @@ Background@ASSETBROWSER_PANEL: Width: 195 Height: 25 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: X: PARENT_RIGHT - WIDTH - 270 Y: 60 @@ -185,21 +215,6 @@ Background@ASSETBROWSER_PANEL: Height: 25 Font: TinyBold 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: X: 226 Y: PARENT_BOTTOM - 75 @@ -248,21 +263,6 @@ Background@ASSETBROWSER_PANEL: Height: 20 MinimumValue: 1 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: Key: escape X: PARENT_RIGHT - 180