Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Work in progress for displaying icon while laoding image...

Browse Source
This commit is contained in:
troy%netscape.com 1998-09-20 00:08:24 +00:00
parent 3fe9196cce
commit 294778023e
2 changed files with 76 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
layout/generic/nsImageFrame.cpp
View File

@ -45,6 +45,7 @@
#include "nsIFontMetrics.h" #include "nsIFontMetrics.h"
#include "nsCSSRendering.h" #include "nsCSSRendering.h"
#include "nsIDOMHTMLImageElement.h" #include "nsIDOMHTMLImageElement.h"
#include "nsIDeviceContext.h"
#define BROKEN_IMAGE_URL "resource:/res/html/broken-image.gif" #define BROKEN_IMAGE_URL "resource:/res/html/broken-image.gif"
@ -617,26 +618,49 @@ ImageFrame::Paint(nsIPresContext& aPresContext,
if (nsnull == image) { if (nsnull == image) {
// No image yet. Draw the icon that indicates we're loading, and display // No image yet. Draw the icon that indicates we're loading, and display
// the alt-text // the alt-text
nsAutoString altText; // Display a recessed one-pixel border in the inner area
if (NS_CONTENT_ATTR_HAS_VALUE == mContent->GetAttribute("ALT", altText)) { nsRect inner;
// Display a recessed one-pixel border in the inner area GetInnerArea(&aPresContext, inner);
nsRect inner;
GetInnerArea(&aPresContext, inner);
float p2t = aPresContext.GetPixelsToTwips(); float p2t = aPresContext.GetPixelsToTwips();
nsRecessedBorder recessedBorder(NSIntPixelsToTwips(1, p2t)); nsRecessedBorder recessedBorder(NSIntPixelsToTwips(1, p2t));
nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this, inner, nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this, inner,
inner, recessedBorder, 0); inner, recessedBorder, 0);
inner.Deflate(NSIntPixelsToTwips(1, p2t), NSIntPixelsToTwips(1, p2t)); inner.Deflate(NSIntPixelsToTwips(1, p2t), NSIntPixelsToTwips(1, p2t));
// Leave a 8 pixel left/right padding, and a 5 pixel top/bottom padding // Leave a 5 pixel top/bottom padding
inner.Deflate(NSIntPixelsToTwips(8, p2t), NSIntPixelsToTwips(5, p2t)); inner.Deflate(0, NSIntPixelsToTwips(5, p2t));
#if 0
// If there's room then display the icon
if (!inner.IsEmpty()) {
nsIDeviceContext* dc = aRenderingContext.GetDeviceContext();
nsIImage* icon;
if (NS_SUCCEEDED(dc->LoadIconImage(NS_ICON_LOADING_IMAGE, icon))) {
// Leave a 6 pixel left padding
inner.Deflate(NSIntPixelsToTwips(6, p2t), 0);
// XXX Clip...
aRenderingContext.DrawImage(icon, inner.x, inner.y);
NS_RELEASE(icon);
}
NS_RELEASE(dc);
}
#endif
// Now display the alt-text if there's room
if (!inner.IsEmpty()) {
nsAutoString altText;
if (NS_CONTENT_ATTR_HAS_VALUE == mContent->GetAttribute("ALT", altText)) {
// Leave a 8 pixel left/right padding
inner.Deflate(NSIntPixelsToTwips(8, p2t), 0);
// If there's room, then display the alt-text
if (!inner.IsEmpty()) {
DisplayAltText(aPresContext, aRenderingContext, altText, inner); DisplayAltText(aPresContext, aRenderingContext, altText, inner);
} }
} }
return NS_OK; return NS_OK;
} }

52
layout/html/base/src/nsImageFrame.cpp
View File

@ -45,6 +45,7 @@
#include "nsIFontMetrics.h" #include "nsIFontMetrics.h"
#include "nsCSSRendering.h" #include "nsCSSRendering.h"
#include "nsIDOMHTMLImageElement.h" #include "nsIDOMHTMLImageElement.h"
#include "nsIDeviceContext.h"
#define BROKEN_IMAGE_URL "resource:/res/html/broken-image.gif" #define BROKEN_IMAGE_URL "resource:/res/html/broken-image.gif"
@ -617,26 +618,49 @@ ImageFrame::Paint(nsIPresContext& aPresContext,
if (nsnull == image) { if (nsnull == image) {
// No image yet. Draw the icon that indicates we're loading, and display // No image yet. Draw the icon that indicates we're loading, and display
// the alt-text // the alt-text
nsAutoString altText; // Display a recessed one-pixel border in the inner area
if (NS_CONTENT_ATTR_HAS_VALUE == mContent->GetAttribute("ALT", altText)) { nsRect inner;
// Display a recessed one-pixel border in the inner area GetInnerArea(&aPresContext, inner);
nsRect inner;
GetInnerArea(&aPresContext, inner);
float p2t = aPresContext.GetPixelsToTwips(); float p2t = aPresContext.GetPixelsToTwips();
nsRecessedBorder recessedBorder(NSIntPixelsToTwips(1, p2t)); nsRecessedBorder recessedBorder(NSIntPixelsToTwips(1, p2t));
nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this, inner, nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this, inner,
inner, recessedBorder, 0); inner, recessedBorder, 0);
inner.Deflate(NSIntPixelsToTwips(1, p2t), NSIntPixelsToTwips(1, p2t)); inner.Deflate(NSIntPixelsToTwips(1, p2t), NSIntPixelsToTwips(1, p2t));
// Leave a 8 pixel left/right padding, and a 5 pixel top/bottom padding // Leave a 5 pixel top/bottom padding
inner.Deflate(NSIntPixelsToTwips(8, p2t), NSIntPixelsToTwips(5, p2t)); inner.Deflate(0, NSIntPixelsToTwips(5, p2t));
#if 0
// If there's room then display the icon
if (!inner.IsEmpty()) {
nsIDeviceContext* dc = aRenderingContext.GetDeviceContext();
nsIImage* icon;
if (NS_SUCCEEDED(dc->LoadIconImage(NS_ICON_LOADING_IMAGE, icon))) {
// Leave a 6 pixel left padding
inner.Deflate(NSIntPixelsToTwips(6, p2t), 0);
// XXX Clip...
aRenderingContext.DrawImage(icon, inner.x, inner.y);
NS_RELEASE(icon);
}
NS_RELEASE(dc);
}
#endif
// Now display the alt-text if there's room
if (!inner.IsEmpty()) {
nsAutoString altText;
if (NS_CONTENT_ATTR_HAS_VALUE == mContent->GetAttribute("ALT", altText)) {
// Leave a 8 pixel left/right padding
inner.Deflate(NSIntPixelsToTwips(8, p2t), 0);
// If there's room, then display the alt-text
if (!inner.IsEmpty()) {
DisplayAltText(aPresContext, aRenderingContext, altText, inner); DisplayAltText(aPresContext, aRenderingContext, altText, inner);
} }
} }
return NS_OK; return NS_OK;
} }