From d40fa73ba2ef83dd871840f93fb35bf3db40b74b Mon Sep 17 00:00:00 2001 From: "troy%netscape.com" Date: Sat, 24 Apr 1999 02:52:58 +0000 Subject: [PATCH] Added function GetClipView() git-svn-id: svn://10.0.0.236/trunk@29020 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/view/public/nsIScrollableView.h | 5 +++++ mozilla/view/src/nsScrollingView.cpp | 10 ++++++++-- mozilla/view/src/nsScrollingView.h | 2 ++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/mozilla/view/public/nsIScrollableView.h b/mozilla/view/public/nsIScrollableView.h index bc3ce11bde4..cec1cec9e50 100644 --- a/mozilla/view/public/nsIScrollableView.h +++ b/mozilla/view/public/nsIScrollableView.h @@ -203,6 +203,11 @@ public: */ NS_IMETHOD ScrollByPages(PRInt32 aNumPages) = 0; + /** + * Returns the clip view + */ + NS_IMETHOD GetClipView(const nsIView** aClipView) const = 0; + private: NS_IMETHOD_(nsrefcnt) AddRef(void) = 0; NS_IMETHOD_(nsrefcnt) Release(void) = 0; diff --git a/mozilla/view/src/nsScrollingView.cpp b/mozilla/view/src/nsScrollingView.cpp index e5266de07d4..2b4c8d15ed3 100644 --- a/mozilla/view/src/nsScrollingView.cpp +++ b/mozilla/view/src/nsScrollingView.cpp @@ -607,7 +607,13 @@ NS_IMETHODIMP nsScrollingView :: SetVisibility(nsViewVisibility aVisibility) } return rv; } - + +NS_IMETHODIMP nsScrollingView :: GetClipView(const nsIView** aClipView) const +{ + NS_PRECONDITION(aClipView, "null pointer"); + *aClipView = mClipView; + return NS_OK; +} void nsScrollingView :: HandleScrollEvent(nsGUIEvent *aEvent, PRUint32 aEventFlags) { @@ -1087,7 +1093,7 @@ NS_IMETHODIMP nsScrollingView :: ComputeScrollOffsets(PRBool aAdjustWidgets) // of a problem. if (0 == oldsizey) mOffsetY = 0; - else + else { mOffsetY = NSIntPixelsToTwips(NSTwipsToIntPixels(nscoord(((float)oldpos * mSizeY) / oldsizey), scale), p2t); diff --git a/mozilla/view/src/nsScrollingView.h b/mozilla/view/src/nsScrollingView.h index 07bc5454b9e..e427d8afd0d 100644 --- a/mozilla/view/src/nsScrollingView.h +++ b/mozilla/view/src/nsScrollingView.h @@ -74,6 +74,8 @@ public: NS_IMETHOD GetLineHeight(nscoord *aHeight); NS_IMETHOD ScrollByLines(PRInt32 aNumLines); NS_IMETHOD ScrollByPages(PRInt32 aNumPages); + + NS_IMETHOD GetClipView(const nsIView** aClipView) const; //locals void HandleScrollEvent(nsGUIEvent *aEvent, PRUint32 aEventFlags);