vitalif
/
phantomjs
mirror of https://github.com/vitalif/phantomjs
1
0
Fork 0
Code Issues Releases Wiki Activity

Renamed pageScroll to scrollPosition

1.3
Kapil Reddy 2011-07-11 12:17:40 +05:30
parent 983518d913
commit 7641e4e1a4
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
python/pyphantomjs/webpage.py
View File

@ -136,10 +136,10 @@ class WebPage(QObject):
if not self.m_clipRect.isEmpty():
frameRect = self.m_clipRect
if self.m_webPage.pageScroll:
if self.m_webPage.scrollPosition:
self.m_webPage.mainFrame().\
setScrollPosition(QPoint(self.m_webPage.pageScroll.x(),
self.m_webPage.pageScroll.y() ))
setScrollPosition(QPoint(self.m_webPage.scrollPosition.x(),
self.m_webPage.scrollPosition.y() ))
image = QImage(frameRect.size(), QImage.Format_ARGB32)
image.fill(qRgba(255, 255, 255, 0))
@ -427,16 +427,16 @@ class WebPage(QObject):
self.m_webPage.setViewportSize(QSize(sizes['width'], sizes['height']))
@pyqtProperty('QVariantMap')
def pageScroll(self):
scroll = self.m_webPage.pageScroll
def scrollPosition(self):
scroll = self.m_webPage.scrollPosition
result = {
'left': scroll.x(),
'top': scroll.y()
}
return result
@pageScroll.setter
def pageScroll(self, size):
@scrollPosition.setter
def scrollPosition(self, size):
names = ('left', 'top')
for item in names:
try:
@ -444,9 +444,7 @@ class WebPage(QObject):
if globals()[item] < 0:
globals()[item] = 0
except KeyError:
globals()[item] = getattr(self.m_webPage.pageScroll(), item)()
self.m_webPage.pageScroll = QPoint(left, top)
globals()[item] = getattr(self.m_webPage.scrollPosition, item)()
self.m_webPage.scrollPosition = QPoint(left, top)
do_action('WebPage')