Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed ConstructRootFrame() to check if the device is scrollable when

Browse Source 
determining whether to make the viewport scrollable


git-svn-id: svn://10.0.0.236/trunk@27085 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
troy%netscape.com
1999-04-11 03:10:20 +00:00
parent a0193895a8
commit 36f1020d73
2 changed files with 50 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
mozilla/layout/base/nsCSSFrameConstructor.cpp
View File

@@ -57,6 +57,7 @@
#include "nsStyleChangeList.h"
#include "nsIFormControl.h"
#include "nsCSSAtoms.h"
#include "nsIDeviceContext.h"
#ifdef INCLUDE_XUL
#include "nsXULAtoms.h"
@@ -1783,11 +1784,28 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIPresContext* aPresContext,
viewManager->GetRootView(rootView);
viewportFrame->SetView(rootView);
// As long as the webshell doesn't prohibit it, create a scroll frame
// that will act as the scolling mechanism for the viewport
// XXX We should only do this when presenting to the screen, i.e., for galley
// mode and print-preview, but not when printing
PRBool isScrollable = PR_FALSE;
// If the device supports scrolling (e.g., in galley mode on the screen and
// for print-preview, but not when printing), then create a scroll frame that
// will act as the scrolling mechanism for the viewport.
// XXX Do we even need a viewport when printing to a printer?
// XXX It would be nice to have a better way to query for whether the device
// is scrollable
PRBool isScrollable = PR_TRUE;
if (aPresContext) {
nsIDeviceContext* dc;
aPresContext->GetDeviceContext(&dc);
if (dc) {
PRBool supportsWidgets;
if (NS_SUCCEEDED(dc->SupportsNativeWidgets(supportsWidgets))) {
isScrollable = supportsWidgets;
}
NS_RELEASE(dc);
}
}
// As long as the webshell doesn't prohibit it, and the device supports
// it, create a scroll frame that will act as the scolling mechanism for
// the viewport.
nsISupports* container;
if (nsnull != aPresContext) {
aPresContext->GetContainer(&container);
@@ -1797,8 +1815,8 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIPresContext* aPresContext,
if (nsnull != webShell) {
PRInt32 scrolling = -1;
webShell->GetScrolling(scrolling);
if (NS_STYLE_OVERFLOW_HIDDEN != scrolling) {
isScrollable = PR_TRUE;
if (NS_STYLE_OVERFLOW_HIDDEN == scrolling) {
isScrollable = PR_FALSE;
}
NS_RELEASE(webShell);
}

32
mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
View File

@@ -57,6 +57,7 @@
#include "nsStyleChangeList.h"
#include "nsIFormControl.h"
#include "nsCSSAtoms.h"
#include "nsIDeviceContext.h"
#ifdef INCLUDE_XUL
#include "nsXULAtoms.h"
@@ -1783,11 +1784,28 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIPresContext* aPresContext,
viewManager->GetRootView(rootView);
viewportFrame->SetView(rootView);
// As long as the webshell doesn't prohibit it, create a scroll frame
// that will act as the scolling mechanism for the viewport
// XXX We should only do this when presenting to the screen, i.e., for galley
// mode and print-preview, but not when printing
PRBool isScrollable = PR_FALSE;
// If the device supports scrolling (e.g., in galley mode on the screen and
// for print-preview, but not when printing), then create a scroll frame that
// will act as the scrolling mechanism for the viewport.
// XXX Do we even need a viewport when printing to a printer?
// XXX It would be nice to have a better way to query for whether the device
// is scrollable
PRBool isScrollable = PR_TRUE;
if (aPresContext) {
nsIDeviceContext* dc;
aPresContext->GetDeviceContext(&dc);
if (dc) {
PRBool supportsWidgets;
if (NS_SUCCEEDED(dc->SupportsNativeWidgets(supportsWidgets))) {
isScrollable = supportsWidgets;
}
NS_RELEASE(dc);
}
}
// As long as the webshell doesn't prohibit it, and the device supports
// it, create a scroll frame that will act as the scolling mechanism for
// the viewport.
nsISupports* container;
if (nsnull != aPresContext) {
aPresContext->GetContainer(&container);
@@ -1797,8 +1815,8 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIPresContext* aPresContext,
if (nsnull != webShell) {
PRInt32 scrolling = -1;
webShell->GetScrolling(scrolling);
if (NS_STYLE_OVERFLOW_HIDDEN != scrolling) {
isScrollable = PR_TRUE;
if (NS_STYLE_OVERFLOW_HIDDEN == scrolling) {
isScrollable = PR_FALSE;
}
NS_RELEASE(webShell);
}