1 files changed, 94 insertions, 18 deletions

diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp
index 9b46a59782..22a1ef94a7 100644
--- a/indra/newview/llpreviewtexture.cpp
+++ b/indra/newview/llpreviewtexture.cpp
@@ -249,6 +249,7 @@ void LLPreviewTexture::draw()
 			}
 		}
 	} 
+
 }
 
 
@@ -283,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();
 }
 
@@ -365,13 +400,19 @@ void LLPreviewTexture::updateDimensions()
 {
 	if (!mImage)
 		return;
+
+	if(mImage->getFullWidth() == 0 || mImage->getFullHeight() == 0)
+	{
+		return;
+	}
+
 	
 	mUpdateDimensions = FALSE;
-	
-	// set text on dimensions display (should be moved out of here and into a callback of some sort)
+
 	childSetTextArg("dimensions", "[WIDTH]", llformat("%d", mImage->getFullWidth()));
 	childSetTextArg("dimensions", "[HEIGHT]", llformat("%d", mImage->getFullHeight()));
 
+	
 	LLRect dim_rect;
 	childGetRect("dimensions", dim_rect);
 
@@ -380,34 +421,68 @@ void LLPreviewTexture::updateDimensions()
 	// 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 screen_width = gFloaterView->getSnapRect().getWidth();
+	S32 screen_height = gFloaterView->getSnapRect().getHeight();
 
-	S32 client_width = client_rect.getWidth();
-	S32 client_height = client_rect.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(mAspectRatio > 1.f)
 		{
 			client_height = llceil((F32)client_width / mAspectRatio);
-			if(client_height > client_rect.getHeight())
+			if(client_height > max_image_height)
 			{
-				client_height = client_rect.getHeight();
+				client_height = max_image_height;
 				client_width = llceil((F32)client_height * mAspectRatio);
 			}
 		}
-		else
+		else//mAspectRatio < 1.f
 		{
 			client_width = llceil((F32)client_height * mAspectRatio);
-			if(client_width > client_rect.getWidth())
+			if(client_width > max_image_width)
 			{
-				client_width = client_rect.getWidth();
+				client_width = max_image_width;
 				client_height = llceil((F32)client_width / mAspectRatio);
 			}
 		}
 	}
+	else
+	{
+
+		if(client_height > max_image_height)
+		{
+			F32 ratio = (F32)max_image_height/client_height;
+			client_height = max_image_height;
+			client_width = llceil((F32)client_height * ratio);
+		}
+		
+		if(client_width > max_image_width)
+		{
+			F32 ratio = (F32)max_image_width/client_width;
+			client_width = max_image_width;
+			client_height = llceil((F32)client_width * ratio);
+		}
+	}
+
+	//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));
+
+	//reshape floater
+	reshape( floater_width, floater_height );
+	gFloaterView->adjustToFitScreen(this, FALSE);
+
+	//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 ;
 
 	mClientRect.setLeftTopAndSize(client_rect.getCenterX() - (client_width / 2), client_rect.getCenterY() +  (client_height / 2), client_width, client_height);	
 
@@ -469,6 +544,7 @@ void LLPreviewTexture::loadAsset()
 	mImage->setBoostLevel(LLViewerTexture::BOOST_PREVIEW);
 	mImage->forceToSaveRawImage(0) ;
 	mAssetStatus = PREVIEW_ASSET_LOADING;
+	mUpdateDimensions = TRUE;
 	updateDimensions();
 	childSetEnabled("save_tex_btn", canSaveAs());
 }