wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 389756, make full page zoom interact a bit better with image auto zoom, r+sr=jst, a=blocking1.9+

Browse Source
This commit is contained in:
Olli.Pettay@helsinki.fi 2008-02-07 11:58:05 -08:00
parent 1f13c829ee
commit 13f701cdaa
1 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
content/html/document/src/nsImageDocument.cpp
View File

@ -69,6 +69,9 @@
#include "nsIDOMNSHTMLElement.h"
#include "nsContentErrors.h"
#include "ImageErrors.h"
#include "nsIDocShell.h"
#include "nsIContentViewer.h"
#include "nsIMarkupDocumentViewer.h"
#define AUTOMATIC_IMAGE_RESIZING_PREF "browser.enable_automatic_image_resizing"
@ -128,6 +131,9 @@ protected:
(float)mVisibleHeight / mImageHeight);
}
void SetZoomLevel(float aZoomLevel);
float GetZoomLevel();
nsCOMPtr<nsIContent> mImageContent;
PRInt32 mVisibleWidth;
@ -409,6 +415,10 @@ nsImageDocument::GetImageRequest(imgIRequest** aImageRequest)
NS_IMETHODIMP
nsImageDocument::ShrinkToFit()
{
if (GetZoomLevel() != 1.0 && mImageIsResized) {
return NS_OK;
}
// Keep image content alive while changing the attributes.
nsCOMPtr<nsIContent> imageContent = mImageContent;
nsCOMPtr<nsIDOMHTMLImageElement> image = do_QueryInterface(mImageContent);
@ -490,9 +500,11 @@ nsImageDocument::ToggleImageSize()
mShouldResize = PR_TRUE;
if (mImageIsResized) {
mShouldResize = PR_FALSE;
SetZoomLevel(1.0);
RestoreImage();
}
else if (mImageIsOverflowing) {
SetZoomLevel(1.0);
ShrinkToFit();
}
@ -504,6 +516,7 @@ nsImageDocument::OnStartContainer(imgIRequest* aRequest, imgIContainer* aImage)
{
aImage->GetWidth(&mImageWidth);
aImage->GetHeight(&mImageHeight);
SetZoomLevel(1.0);
CheckOverflowing(mResizeImageByDefault);
UpdateTitleAndCharset();
@ -519,6 +532,7 @@ nsImageDocument::HandleEvent(nsIDOMEvent* aEvent)
CheckOverflowing(PR_FALSE);
}
else if (eventType.EqualsLiteral("click")) {
SetZoomLevel(1.0);
mShouldResize = PR_TRUE;
if (mImageIsResized) {
PRInt32 x = 0, y = 0;
@ -548,6 +562,7 @@ nsImageDocument::HandleEvent(nsIDOMEvent* aEvent)
if (charCode == 0x2B) {
mShouldResize = PR_FALSE;
if (mImageIsResized) {
SetZoomLevel(1.0);
RestoreImage();
}
}
@ -555,6 +570,7 @@ nsImageDocument::HandleEvent(nsIDOMEvent* aEvent)
else if (charCode == 0x2D) {
mShouldResize = PR_TRUE;
if (mImageIsOverflowing) {
SetZoomLevel(1.0);
ShrinkToFit();
}
}
@ -637,8 +653,11 @@ nsImageDocument::CheckOverflowing(PRBool changeState)
if (styleContext->GetStylePadding()->GetPadding(m))
visibleArea.Deflate(m);
mVisibleWidth = nsPresContext::AppUnitsToIntCSSPixels(visibleArea.width);
mVisibleHeight = nsPresContext::AppUnitsToIntCSSPixels(visibleArea.height);
float zoomLevel = GetZoomLevel();
mVisibleWidth = PRInt32(zoomLevel *
nsPresContext::AppUnitsToIntCSSPixels(visibleArea.width));
mVisibleHeight = PRInt32(zoomLevel *
nsPresContext::AppUnitsToIntCSSPixels(visibleArea.height));
}
PRBool imageWasOverflowing = mImageIsOverflowing;
@ -723,6 +742,35 @@ nsImageDocument::UpdateTitleAndCharset()
mImageWidth, mImageHeight, status);
}
void
nsImageDocument::SetZoomLevel(float aZoomLevel)
{
nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocumentContainer);
if (docShell) {
nsCOMPtr<nsIContentViewer> cv;
docShell->GetContentViewer(getter_AddRefs(cv));
nsCOMPtr<nsIMarkupDocumentViewer> mdv = do_QueryInterface(cv);
if (mdv) {
mdv->SetFullZoom(aZoomLevel);
}
}
}
float
nsImageDocument::GetZoomLevel()
{
float zoomLevel = 1.0;
nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocumentContainer);
if (docShell) {
nsCOMPtr<nsIContentViewer> cv;
docShell->GetContentViewer(getter_AddRefs(cv));
nsCOMPtr<nsIMarkupDocumentViewer> mdv = do_QueryInterface(cv);
if (mdv) {
mdv->GetFullZoom(&zoomLevel);
}
}
return zoomLevel;
}
nsresult
NS_NewImageDocument(nsIDocument** aResult)