Merge pull request #1652 from Areloch/ABAssetPreviewBitmapsFix

Fix for AB Preview Button Bitmaps display

Author: Areloch

Engine/source/gui/buttons/guiIconButtonCtrl.cpp

@@ -202,11 +202,10 @@ bool GuiIconButtonCtrl::resize(const Point2I &newPosition, const Point2I &newExt
 
 void GuiIconButtonCtrl::setBitmap(const char *name)
 {
+   _setBitmap(name);
    if(!isAwake())
       return;
 
-   _setBitmap(name);
-
    // So that extent is recalculated if autoSize is set.
    resize( getPosition(), getExtent() );
 

Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript

@@ -686,7 +686,37 @@ function AssetBrowser::buildAssetPreview( %this, %asset, %moduleName )
    %tooltip = %assetName;
 
    %textBottomPad = 20;
+
+   %previewScaleSize = %this-->previewSlider.getValue();
+   
+   if(%previewScaleSize $= "")
+   {
+      %previewScaleSize = 1;
+      %this-->previewSlider.setValue(1);
+   }
+   
+   if(%this.selectMode)
+   {
+      %doubleClickCommand = %this @ ".selectAsset( "@ %this @ ".selectedAsset );";
+   }
+   else
+   {
+      %doubleClickCommand = %this @ ".callAssetTypeFunc(" @ %assetType @ ", \"onEdit\", \"" @ %moduleName @ "\", \"" @ %assetName @ "\" );";
+   }
 
+   %this.previewData.previewLoaded = true;
+   
+   //echo("AssetBrowser::buildAssetPreview() - building preview of asset type: " @ %assetType);
+   %this.callAssetTypeFunc(%assetType, "buildBrowserElement", %moduleName, %assetName, %this.previewData);
+   
+   //debug dump
+   %tooltip = %this.previewData.tooltip;
+   %assetName = %this.previewData.assetName;
+   %previewImage = %this.previewData.previewImage;
+   
+   if(%this.previewData.doubleClickCommand !$= "")
+      %doubleClickCommand = %this.previewData.doubleClickCommand;
+      
    %previewButton = new GuiIconButtonCtrl()
    {
       class = "AssetBrowserPreviewButton";
@@ -699,17 +729,18 @@ function AssetBrowser::buildAssetPreview( %this, %asset, %moduleName )
       buttonType = "RadioButton";
       buttonMargin = "0 -10";
       profile = ToolsGuiDefaultIconBtnProfile;
+      tooltip =  %this.previewData.tooltip;
       assetBrowser = %this;
+      assetName = %assetName;
+      moduleName = %moduleName;
+      assetType = %assetType;
+      bitmapAsset = %this.previewData.previewImage;
+      Command = %this @ ".updateSelection( $ThisControl.assetName, $ThisControl.moduleName );";
+      altCommand = %doubleClickCommand;
+      text = %this.previewData.assetName;
+      originalAssetName = %this.previewData.assetName;
    };
 
-   %previewScaleSize = %this-->previewSlider.getValue();
-   
-   if(%previewScaleSize $= "")
-   {
-      %previewScaleSize = 1;
-      %this-->previewSlider.setValue(1);
-   }
-   
    if(%previewScaleSize == 0 || startsWith(%this.dirHandler.currentAddress, "Creator"))
    {
       %previewButton.iconLocation = "Left";
@@ -728,48 +759,6 @@ function AssetBrowser::buildAssetPreview( %this, %asset, %moduleName )
       %this.previewListMode = false;
    }
 
-   //%previewButton.extent = %previewSize.x + %previewBounds SPC %previewSize.y + %previewBounds + 24;
-   %previewButton.assetName = %assetName;
-   %previewButton.moduleName = %moduleName;
-   %previewButton.assetType = %assetType;
-   
-   if(%this.selectMode)
-   {
-      %doubleClickCommand = %this @ ".selectAsset( "@ %this @ ".selectedAsset );";
-   }
-   else
-   {
-      %doubleClickCommand = %this @ ".callAssetTypeFunc(" @ %assetType @ ", \"onEdit\", \"" @ %moduleName @ "\", \"" @ %assetName @ "\" );";
-   }
-   
-   %this.previewData.previewLoaded = true;
-   
-   //echo("AssetBrowser::buildAssetPreview() - building preview of asset type: " @ %assetType);
-   %this.callAssetTypeFunc(%assetType, "buildBrowserElement", %moduleName, %assetName, %this.previewData);
-   
-   //debug dump
-   %tooltip = %this.previewData.tooltip;
-   %assetName = %this.previewData.assetName;
-   %previewImage = %this.previewData.previewImage;
-   
-   if(%this.previewData.doubleClickCommand !$= "")
-      %doubleClickCommand = %this.previewData.doubleClickCommand;
-   
-   %previewButton.assetName = %assetName;
-   %previewButton.moduleName = %moduleName;
-   %previewButton.assetType = %assetType;
-   %previewButton.assetBrowser = %this;
-   
-   %previewButton.setBitmap(%this.previewData.previewImage);
-   
-   %previewButton.profile = "AssetBrowserPreview" @ %previewButton.assetType;
-   %previewButton.tooltip = %this.previewData.tooltip;
-   %previewButton.Command = %this @ ".updateSelection( $ThisControl.assetName, $ThisControl.moduleName );";
-   %previewButton.altCommand = %doubleClickCommand;
-   
-   %previewButton.text = %this.previewData.assetName;
-   %previewButton.text.originalAssetName = %this.previewData.assetName;
-
    // add to the gui control array
    %this-->assetList.add(%previewButton);