Differential D17929 Diff 48589 ui/presentationwidget.cpp

Changeset View

Standalone View

View Options

ui/presentationwidget.cpp

Context not available.
277 277​
278 // setFocus() so KCursor::setAutoHideCursor() goes into effect if it's enabled 278​ // setFocus() so KCursor::setAutoHideCursor() goes into effect if it's enabled
279 setFocus( Qt::OtherFocusReason ); 279​ setFocus( Qt::OtherFocusReason );
280​
281​ // Catch TabletEnterProximity and TabletLeaveProximity events from the QApplication
282​ qApp->installEventFilter( this );
280} 283​}
281 284​
282PresentationWidget::~PresentationWidget() 285​PresentationWidget::~PresentationWidget()
Context not available.
308 QVector< PresentationFrame * >::iterator fIt = m_frames.begin(), fEnd = m_frames.end(); 311​ QVector< PresentationFrame * >::iterator fIt = m_frames.begin(), fEnd = m_frames.end();
309 for ( ; fIt != fEnd; ++fIt ) 312​ for ( ; fIt != fEnd; ++fIt )
310 delete *fIt; 313​ delete *fIt;
314​
315​ qApp->removeEventFilter( this );
311} 316​}
312 317​
313 318​
Context not available.
532 } 537​ }
533} 538​}
534 539​
540​bool PresentationWidget::eventFilter (QObject *o, QEvent *e )
shubhamUnsubmitted
Done

Remove space before o

shubham: Remove space before o
541​{
542​ if ( o == qApp )
543​ {
544​ if ( e->type() == QTabletEvent::TabletEnterProximity )
545​ {
546​ setCursor( QCursor( Qt::CrossCursor ) );
547​ }
548​ if ( e->type() == QTabletEvent::TabletLeaveProximity )
549​ {
550​ if ( Okular::Settings::slidesCursor() == Okular::Settings::EnumSlidesCursor::Visible )
551​ {
552​ setCursor( QCursor( Qt::ArrowCursor ) );
553​ }
554​ else
555​ {
556​ setCursor( QCursor( Qt::BlankCursor ) );
557​ }
558​ }
559​ }
560​ return false;
561​}
562​
535// <widget events> 563​// <widget events>
536bool PresentationWidget::event( QEvent * e ) 564​bool PresentationWidget::event( QEvent * e )
537{ 565​{
Context not available.
748 if ( !m_drawingEngine && Okular::Settings::slidesCursor() != Okular::Settings::EnumSlidesCursor::Hidden ) 776​ if ( !m_drawingEngine && Okular::Settings::slidesCursor() != Okular::Settings::EnumSlidesCursor::Hidden )
749 testCursorOnLink( e->x(), e->y() ); 777​ testCursorOnLink( e->x(), e->y() );
750 778​
779​ // Explicitly show the cursor, it may have been hidden by a recent TabletLeaveProximity event
780​ if ( e->source() == Qt::MouseEventNotSynthesized && Okular::Settings::slidesCursor() != Okular::Settings::EnumSlidesCursor::Hidden )
781​ {
782​ setCursor( QCursor( Qt::ArrowCursor ) );
783​ }
784​
751 if ( !m_topBar->isHidden() ) 785​ if ( !m_topBar->isHidden() )
752 { 786​ {
753 // hide a shown bar when exiting the area 787​ // hide a shown bar when exiting the area
Context not available.
1336 // manually disable and re-enable the pencil mode, so we can do 1370​ // manually disable and re-enable the pencil mode, so we can do
1337 // cleaning of the actual drawer and create a new one just after 1371​ // cleaning of the actual drawer and create a new one just after
1338 // that - that gives continuous drawing 1372​ // that - that gives continuous drawing
1339 slotChangeDrawingToolEngine( QDomElement() ); 1373​ delete m_drawingEngine;
1340 slotChangeDrawingToolEngine( m_currentDrawingToolElement ); 1374​ m_drawingRect = QRect();
1375​ m_drawingEngine = new SmoothPathEngine( m_currentDrawingToolElement );
aacidAuthorUnsubmitted
Not Done

Is this changeset related?

aacid: Is this changeset related?
sanderUnsubmitted
Not Done

It is. The code I added is exactly what the two calls to slotChangeDrawingToolEngine do, except that the first one additionally set the cursor to 'Arrow' (without good reason).

If you want this documented better then it may be a good idea to have it in a separate patch.

sander: It is. The code I added is exactly what the two calls to `slotChangeDrawingToolEngine` do…
aacidAuthorUnsubmitted
Not Done

ok

aacid: ok
1341 1376​
1342 // schedule repaint 1377​ // schedule repaint
1343 update(); 1378​ update();
Context not available.