Merge remote-tracking branch 'origin/Applications/19.04'

remotes/origin/fix-bug-383943-hidpi-glitches
Albert Astals Cid 7 years ago
commit 073f50cab8
  1. 7
      generators/poppler/generator_pdf.cpp
  2. 7
      ui/pageview.cpp

@ -513,8 +513,13 @@ Okular::Action* createLinkFromPopplerLink(const Poppler::Link *popplerLink, bool
break;
#endif
#ifdef HAVE_POPPLER_0_50
case Poppler::Link::OCGState:
Q_UNREACHABLE();
link = new Okular::BackendOpaqueAction();
link->setNativeId( QVariant::fromValue( static_cast<const Poppler::LinkOCGState*>( popplerLink ) ) );
deletePopplerLink = false;
break;
#endif
}
#ifdef HAVE_POPPLER_0_64

@ -4401,8 +4401,13 @@ QMenu* PageView::createProcessLinkMenu(PageViewItem *item, const QPoint &eventPo
const Okular::ObjectRect * rect = item->page()->objectRect( Okular::ObjectRect::Action, nX, nY, item->uncroppedWidth(), item->uncroppedHeight() );
if ( rect )
{
QMenu *menu = new QMenu(this);
const Okular::Action * link = static_cast< const Okular::Action * >( rect->object() );
if (!link)
return nullptr;
QMenu *menu = new QMenu(this);
// creating the menu and its actions
QAction * processLink = menu->addAction( i18n( "Follow This Link" ) );
processLink->setObjectName(QStringLiteral("ProcessLinkAction"));

Loading…
Cancel
Save