office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-09-13 13:11:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fordward port Revision 606296

Browse source 
********
 Fix "No scrolling when selection reaches border"

svn path=/trunk/playground/graphics/okular/; revision=607042
This commit is contained in:
Albert Astals Cid 2006-11-22 21:32:21 +00:00
parent 1c710fc2eb
commit ee046a1ad6
2 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
ui/pageview.cpp
View file

@ -128,6 +128,10 @@ public:
bool blockPixmapsRequest; // prevent pixmap requests
PageViewMessage * messageWindow; // in pageviewutils.h
// drag scroll
QPoint dragScrollVector;
QTimer dragScrollTimer;
// actions
KSelectAction * aOrientation;
KSelectAction * aPaperSizes;
@ -287,6 +291,7 @@ PageView::PageView( QWidget *parent, Okular::Document *document )
// conntect the padding of the viewport to pixmaps requests
connect(horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(slotRequestVisiblePixmaps()));
connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(slotRequestVisiblePixmaps()));
connect( &d->dragScrollTimer, SIGNAL(timeout()), this, SLOT(slotDragScroll()) );
// set a corner button to resize the view to the page size
// QPushButton * resizeButton = new QPushButton( viewport() );
@ -1369,6 +1374,9 @@ void PageView::contentsMousePressEvent( QMouseEvent * e )
void PageView::contentsMouseReleaseEvent( QMouseEvent * e )
{
// stop the drag scrolling
d->dragScrollTimer.stop();
// don't perform any mouse action when no document is shown..
if ( d->items.isEmpty() )
{
@ -2043,6 +2051,20 @@ void PageView::selectionEndPoint( const QPoint & pos )
if ( !d->mouseSelecting )
return;
if (pos.x() < horizontalScrollBar()->value()) d->dragScrollVector.setX(pos.x() - horizontalScrollBar()->value());
else if (horizontalScrollBar()->value() + viewport()->width() < pos.x()) d->dragScrollVector.setX(pos.x() - horizontalScrollBar()->value() - viewport()->width());
else d->dragScrollVector.setX(0);
if (pos.y() < verticalScrollBar()->value()) d->dragScrollVector.setY(pos.y() - verticalScrollBar()->value());
else if (verticalScrollBar()->value() + viewport()->height() < pos.y()) d->dragScrollVector.setY(pos.y() - verticalScrollBar()->value() - viewport()->height());
else d->dragScrollVector.setY(0);
if (d->dragScrollVector != QPoint(0, 0))
{
if (!d->dragScrollTimer.isActive()) d->dragScrollTimer.start(100);
}
else d->dragScrollTimer.stop();
// update the selection rect
QRect updateRect = d->mouseSelectionRect;
d->mouseSelectionRect.setBottomLeft( pos );
@ -2726,6 +2748,14 @@ void PageView::slotAutoScoll()
verticalScrollBar()->setValue(verticalScrollBar()->value() + delta);
}
void PageView::slotDragScroll()
{
horizontalScrollBar()->setValue(horizontalScrollBar()->value() + d->dragScrollVector.x());
verticalScrollBar()->setValue(verticalScrollBar()->value() + d->dragScrollVector.y());
QPoint p = widget()->mapFromGlobal( QCursor::pos() );
selectionEndPoint( p );
}
void PageView::slotStopFindAhead()
{
d->typeAheadActive = false;

4
ui/pageview.h
View file

@ -157,9 +157,11 @@ Q_OBJECT
void slotMoveViewport();
// activated by the autoscroll timer (Shift+Up/Down keys)
void slotAutoScoll();
// activated by the dragScroll timer
void slotDragScroll();
// type-ahead find timeout
void slotStopFindAhead();
// sow the welcome message
// show the welcome message
void slotShowWelcome();
// connected to local actions (toolbar, menu, ..)