1 files changed, 158 insertions, 135 deletions

diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp
index a857e30d4f..22a1ef94a7 100644
--- a/indra/newview/llpreviewtexture.cpp
+++ b/indra/newview/llpreviewtexture.cpp
@@ -74,22 +74,10 @@ LLPreviewTexture::LLPreviewTexture(const LLSD& key)
 	  mLastHeight(0),
 	  mLastWidth(0),
 	  mAspectRatio(0.f),
-	  mPreviewToSave(FALSE)
+	  mPreviewToSave(FALSE),
+	  mImage(NULL)
 {
-	const LLViewerInventoryItem *item = static_cast<const LLViewerInventoryItem*>(getItem());
-	if(item)
-	{
-		mShowKeepDiscard = item->getPermissions().getCreator() != gAgent.getID();
-		mImageID = item->getAssetUUID();
-		mIsCopyable = item->checkPermissionsSet(PERM_ITEM_UNRESTRICTED);
-	}
-	else // not an item, assume it's an asset id
-	{
-		mImageID = mItemUUID;
-		mCopyToInv = TRUE;
-		mIsCopyable = TRUE;
-	}
-
+	updateImageID();
 	if (key.has("save_as"))
 	{
 		mPreviewToSave = TRUE;
@@ -97,7 +85,6 @@ LLPreviewTexture::LLPreviewTexture(const LLSD& key)
 	//Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_texture.xml", FALSE);
 }
 
-
 LLPreviewTexture::~LLPreviewTexture()
 {
 	if( mLoadingFullImage )
@@ -129,7 +116,8 @@ BOOL LLPreviewTexture::postBuild()
 	}
 	
 	childSetAction("save_tex_btn", LLPreviewTexture::onSaveAsBtn, this);
-	childSetVisible("save_tex_btn", canSaveAs());
+	childSetVisible("save_tex_btn", true);
+	childSetEnabled("save_tex_btn", canSaveAs());
 	
 	if (!mCopyToInv) 
 	{
@@ -139,7 +127,7 @@ BOOL LLPreviewTexture::postBuild()
 		{
 			childSetCommitCallback("desc", LLPreview::onText, this);
 			childSetText("desc", item->getDescription());
-			childSetPrevalidate("desc", &LLLineEditor::prevalidateASCIIPrintableNoPipe);
+			childSetPrevalidate("desc", &LLTextValidate::validateASCIIPrintableNoPipe);
 		}
 	}
 	
@@ -261,6 +249,7 @@ void LLPreviewTexture::draw()
 			}
 		}
 	} 
+
 }
 
 
@@ -295,18 +284,52 @@ void LLPreviewTexture::saveAs()
 // virtual
 void LLPreviewTexture::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
-//	mLastHeight = 0;
-//	mLastWidth = 0;
-	mUpdateDimensions = TRUE;
 	LLPreview::reshape(width, height, called_from_parent);
+
+	LLRect dim_rect;
+	childGetRect("dimensions", dim_rect);
+
+	S32 horiz_pad = 2 * (LLPANEL_BORDER_WIDTH + PREVIEW_PAD) + PREVIEW_RESIZE_HANDLE_SIZE;
+
+	// add space for dimensions and aspect ratio
+	S32 info_height = dim_rect.mTop + CLIENT_RECT_VPAD;
+
+	LLRect client_rect(horiz_pad, getRect().getHeight(), getRect().getWidth() - horiz_pad, 0);
+	client_rect.mTop -= (PREVIEW_HEADER_SIZE + CLIENT_RECT_VPAD);
+	client_rect.mBottom += PREVIEW_BORDER + CLIENT_RECT_VPAD + info_height ;
+
+	S32 client_width = client_rect.getWidth();
+	S32 client_height = client_rect.getHeight();
+
+	if (mAspectRatio > 0.f)
+	{
+		if(mAspectRatio > 1.f)
+		{
+			client_height = llceil((F32)client_width / mAspectRatio);
+			if(client_height > client_rect.getHeight())
+			{
+				client_height = client_rect.getHeight();
+				client_width = llceil((F32)client_height * mAspectRatio);
+			}
+		}
+		else//mAspectRatio < 1.f
+		{
+			client_width = llceil((F32)client_height * mAspectRatio);
+			if(client_width > client_rect.getWidth())
+			{
+				client_width = client_rect.getWidth();
+				client_height = llceil((F32)client_width / mAspectRatio);
+			}
+		}
+	}
+
+	mClientRect.setLeftTopAndSize(client_rect.getCenterX() - (client_width / 2), client_rect.getCenterY() +  (client_height / 2), client_width, client_height);	
+
 }
 
 // virtual
 void LLPreviewTexture::onFocusReceived()
 {
-	mLastHeight = 0;
-	mLastWidth = 0;
-	mUpdateDimensions = TRUE;
 	LLPreview::onFocusReceived();
 }
 
@@ -317,12 +340,12 @@ void LLPreviewTexture::openToSave()
 
 // static
 void LLPreviewTexture::onFileLoadedForSave(BOOL success, 
-											LLViewerFetchedTexture *src_vi,
-											LLImageRaw* src, 
-											LLImageRaw* aux_src, 
-											S32 discard_level,
-											BOOL final,
-											void* userdata)
+					   LLViewerFetchedTexture *src_vi,
+					   LLImageRaw* src, 
+					   LLImageRaw* aux_src, 
+					   S32 discard_level,
+					   BOOL final,
+					   void* userdata)
 {
 	LLUUID* item_uuid = (LLUUID*) userdata;
 
@@ -377,141 +400,96 @@ void LLPreviewTexture::updateDimensions()
 {
 	if (!mImage)
 		return;
-	
-	mUpdateDimensions = FALSE;
-	
-	S32 image_height = llmax(1, mImage->getFullHeight());
-	S32 image_width = llmax(1, mImage->getFullWidth());
-	// Attempt to make the image 1:1 on screen.
-	// If that fails, cut width by half.
-	S32 client_width = image_width;
-	S32 client_height = image_height;
-	S32 horiz_pad = 2 * (LLPANEL_BORDER_WIDTH + PREVIEW_PAD) + PREVIEW_RESIZE_HANDLE_SIZE;
-	S32 vert_pad = PREVIEW_HEADER_SIZE + 2 * CLIENT_RECT_VPAD + LLPANEL_BORDER_WIDTH;	
-	S32 max_client_width = gViewerWindow->getWindowWidthScaled() - horiz_pad;
-	S32 max_client_height = gViewerWindow->getWindowHeightScaled() - vert_pad;
 
-	if (mAspectRatio > 0.f)
+	if(mImage->getFullWidth() == 0 || mImage->getFullHeight() == 0)
 	{
-		client_height = llceil((F32)client_width / mAspectRatio);
+		return;
 	}
 
-	while ((client_width > max_client_width) ||
-	       (client_height > max_client_height ))
-	{
-		client_width /= 2;
-		client_height /= 2;
-	}
 	
-	S32 view_width = client_width + horiz_pad;
-	S32 view_height = client_height + vert_pad;
-	
-	// set text on dimensions display (should be moved out of here and into a callback of some sort)
+	mUpdateDimensions = FALSE;
+
 	childSetTextArg("dimensions", "[WIDTH]", llformat("%d", mImage->getFullWidth()));
 	childSetTextArg("dimensions", "[HEIGHT]", llformat("%d", mImage->getFullHeight()));
+
 	
+	LLRect dim_rect;
+	childGetRect("dimensions", dim_rect);
+
+	S32 horiz_pad = 2 * (LLPANEL_BORDER_WIDTH + PREVIEW_PAD) + PREVIEW_RESIZE_HANDLE_SIZE;
+
 	// add space for dimensions and aspect ratio
-	S32 info_height = 0;
-	LLRect aspect_rect;
-	childGetRect("combo_aspect_ratio", aspect_rect);
-	S32 aspect_height = aspect_rect.getHeight();
-	info_height += aspect_height + CLIENT_RECT_VPAD;
-	view_height += info_height;
-	
-	S32 button_height = 0;
-	
-	// add space for buttons
-	view_height += 	(BTN_HEIGHT + CLIENT_RECT_VPAD) * 3;
-	button_height = (BTN_HEIGHT + PREVIEW_PAD) * 3;
+	S32 info_height = dim_rect.mTop + CLIENT_RECT_VPAD;
 
-	view_width = llmax(view_width, getMinWidth());
-	view_height = llmax(view_height, getMinHeight());
-	
-	if (view_height != mLastHeight || view_width != mLastWidth)
+	S32 screen_width = gFloaterView->getSnapRect().getWidth();
+	S32 screen_height = gFloaterView->getSnapRect().getHeight();
+
+	S32 max_image_width = screen_width - 2*horiz_pad;
+	S32 max_image_height = screen_height - (PREVIEW_HEADER_SIZE + CLIENT_RECT_VPAD) 
+		- (PREVIEW_BORDER + CLIENT_RECT_VPAD + info_height);
+
+	S32 client_width = llmin(max_image_width,mImage->getFullWidth());
+	S32 client_height = llmin(max_image_height,mImage->getFullHeight());
+
+	if (mAspectRatio > 0.f)
 	{
-		if (getHost())
+		if(mAspectRatio > 1.f)
 		{
-			getHost()->growToFit(view_width, view_height);
-			reshape( view_width, view_height );
-			setOrigin( 0, getHost()->getRect().getHeight() - (view_height + PREVIEW_HEADER_SIZE) );
+			client_height = llceil((F32)client_width / mAspectRatio);
+			if(client_height > max_image_height)
+			{
+				client_height = max_image_height;
+				client_width = llceil((F32)client_height * mAspectRatio);
+			}
 		}
-		else
+		else//mAspectRatio < 1.f
 		{
-			S32 old_top = getRect().mTop;
-			S32 old_left = getRect().mLeft;
-			reshape( view_width, view_height );
-			S32 new_bottom = old_top - getRect().getHeight();
-			setOrigin( old_left, new_bottom );
-		}
-		
-		// Try to keep whole view onscreen, don't allow partial offscreen.
-		if (getHost())
-			gFloaterView->adjustToFitScreen(getHost(), FALSE);
-		else
-			gFloaterView->adjustToFitScreen(this, FALSE);
-		
-		if (image_height > 1 && image_width > 1)
-		{
-			// Resize until we know the image's height
-			mLastWidth = view_width;
-			mLastHeight = view_height;
+			client_width = llceil((F32)client_height * mAspectRatio);
+			if(client_width > max_image_width)
+			{
+				client_width = max_image_width;
+				client_height = llceil((F32)client_width / mAspectRatio);
+			}
 		}
 	}
-	
-	if (!mUserResized)
-	{
-		// clamp texture size to fit within actual size of floater after attempting resize
-		client_width = llmin(client_width, getRect().getWidth() - horiz_pad);
-		client_height = llmin(client_height, getRect().getHeight() - PREVIEW_HEADER_SIZE 
-						- (2 * CLIENT_RECT_VPAD) - LLPANEL_BORDER_WIDTH - info_height);
-
-		
-	}
 	else
 	{
-		client_width = getRect().getWidth() - horiz_pad;
-		if (mAspectRatio > 0)
+
+		if(client_height > max_image_height)
 		{
-			client_height = llround(client_width / mAspectRatio);
+			F32 ratio = (F32)max_image_height/client_height;
+			client_height = max_image_height;
+			client_width = llceil((F32)client_height * ratio);
 		}
-		else
+		
+		if(client_width > max_image_width)
 		{
-			client_height = getRect().getHeight() - vert_pad;
+			F32 ratio = (F32)max_image_width/client_width;
+			client_width = max_image_width;
+			client_height = llceil((F32)client_width * ratio);
 		}
 	}
 
-	S32 max_height = getRect().getHeight() - PREVIEW_BORDER - button_height 
-		- CLIENT_RECT_VPAD - info_height - CLIENT_RECT_VPAD - PREVIEW_HEADER_SIZE;
+	//now back to whole floater
+	S32 floater_width = llmax(getMinWidth(),client_width + 2*horiz_pad);
+	S32 floater_height = llmax(getMinHeight(),client_height + (PREVIEW_HEADER_SIZE + CLIENT_RECT_VPAD)
+		+ (PREVIEW_BORDER + CLIENT_RECT_VPAD + info_height));
 
-	if (mAspectRatio > 0.f)
-	{
-		max_height = llmax(max_height, 1);
+	//reshape floater
+	reshape( floater_width, floater_height );
+	gFloaterView->adjustToFitScreen(this, FALSE);
 
-		if (client_height > max_height)
-		{
-			client_height = max_height;
-			client_width = llround(client_height * mAspectRatio);
-		}
-	}
-	else
-	{
-		S32 max_width = getRect().getWidth() - horiz_pad;
+	//setup image rect...
+	LLRect client_rect(horiz_pad, getRect().getHeight(), getRect().getWidth() - horiz_pad, 0);
+	client_rect.mTop -= (PREVIEW_HEADER_SIZE + CLIENT_RECT_VPAD);
+	client_rect.mBottom += PREVIEW_BORDER + CLIENT_RECT_VPAD + info_height ;
 
-		client_height = llclamp(client_height, 1, max_height);
-		client_width = llclamp(client_width, 1, max_width);
-	}
-	
-	LLRect window_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
-	window_rect.mTop -= (PREVIEW_HEADER_SIZE + CLIENT_RECT_VPAD);
-	window_rect.mBottom += PREVIEW_BORDER + button_height + CLIENT_RECT_VPAD + info_height + CLIENT_RECT_VPAD;
+	mClientRect.setLeftTopAndSize(client_rect.getCenterX() - (client_width / 2), client_rect.getCenterY() +  (client_height / 2), client_width, client_height);	
 
-	mClientRect.setLeftTopAndSize(window_rect.getCenterX() - (client_width / 2), window_rect.mTop, client_width, client_height);	
-	
 	// Hide the aspect ratio label if the window is too narrow
 	// Assumes the label should be to the right of the dimensions
-	LLRect dim_rect, aspect_label_rect;
+	LLRect aspect_label_rect;
 	childGetRect("aspect_ratio", aspect_label_rect);
-	childGetRect("dimensions", dim_rect);
 	childSetVisible("aspect_ratio", dim_rect.mRight < aspect_label_rect.mLeft);
 }
 
@@ -566,8 +544,9 @@ void LLPreviewTexture::loadAsset()
 	mImage->setBoostLevel(LLViewerTexture::BOOST_PREVIEW);
 	mImage->forceToSaveRawImage(0) ;
 	mAssetStatus = PREVIEW_ASSET_LOADING;
+	mUpdateDimensions = TRUE;
 	updateDimensions();
-	childSetVisible("save_tex_btn", canSaveAs());
+	childSetEnabled("save_tex_btn", canSaveAs());
 }
 
 LLPreview::EAssetStatus LLPreviewTexture::getAssetStatus()
@@ -578,3 +557,47 @@ LLPreview::EAssetStatus LLPreviewTexture::getAssetStatus()
 	}
 	return mAssetStatus;
 }
+
+void LLPreviewTexture::updateImageID()
+{
+	const LLViewerInventoryItem *item = static_cast<const LLViewerInventoryItem*>(getItem());
+	if(item)
+	{
+		mImageID = item->getAssetUUID();
+
+		// here's the old logic...
+		//mShowKeepDiscard = item->getPermissions().getCreator() != gAgent.getID();
+		// here's the new logic... 'cos we hate disappearing buttons.
+		mShowKeepDiscard = TRUE;
+
+		mCopyToInv = FALSE;
+		mIsCopyable = item->checkPermissionsSet(PERM_ITEM_UNRESTRICTED);
+	}
+	else // not an item, assume it's an asset id
+	{
+		mImageID = mItemUUID;
+		mShowKeepDiscard = FALSE;
+		mCopyToInv = TRUE;
+		mIsCopyable = TRUE;
+	}
+
+}
+
+/* virtual */
+void LLPreviewTexture::setObjectID(const LLUUID& object_id)
+{
+	mObjectUUID = object_id;
+
+	const LLUUID old_image_id = mImageID;
+
+	// Update what image we're pointing to, such as if we just specified the mObjectID
+	// that this mItemID is part of.
+	updateImageID();
+
+	// If the imageID has changed, start over and reload the new image.
+	if (mImageID != old_image_id)
+	{
+		mAssetStatus = PREVIEW_ASSET_UNLOADED;
+		loadAsset();
+	}
+}