mirror of
https://invent.kde.org/graphics/okular
synced 2024-09-12 20:51:17 +00:00
Merge remote-tracking branch 'origin/release/19.12'
This commit is contained in:
commit
4964e7e42d
|
@ -116,10 +116,12 @@ void PagePrivate::imageRotationDone( RotationJob * job )
|
|||
PixmapObject &object = it.value();
|
||||
(*object.m_pixmap) = QPixmap::fromImage( job->image() );
|
||||
object.m_rotation = job->rotation();
|
||||
object.m_isPartialPixmap = job->isPartialUpdate();
|
||||
} else {
|
||||
PixmapObject object;
|
||||
object.m_pixmap = new QPixmap( QPixmap::fromImage( job->image() ) );
|
||||
object.m_rotation = job->rotation();
|
||||
object.m_isPartialPixmap = job->isPartialUpdate();
|
||||
|
||||
m_pixmaps.insert( job->observer(), object );
|
||||
}
|
||||
|
@ -235,6 +237,9 @@ bool Page::hasPixmap( DocumentObserver *observer, int width, int height, const N
|
|||
if ( width == -1 || height == -1 )
|
||||
return true;
|
||||
|
||||
if ( it.value().m_isPartialPixmap )
|
||||
return false;
|
||||
|
||||
const QPixmap *pixmap = it.value().m_pixmap;
|
||||
|
||||
return (pixmap->width() == width && pixmap->height() == height);
|
||||
|
@ -554,6 +559,7 @@ void PagePrivate::setPixmap( DocumentObserver *observer, QPixmap *pixmap, const
|
|||
}
|
||||
it.value().m_pixmap = pixmap;
|
||||
it.value().m_rotation = m_rotation;
|
||||
it.value().m_isPartialPixmap = isPartialPixmap;
|
||||
} else {
|
||||
// it can happen that we get a setPixmap while closing and thus the page controller is gone
|
||||
if ( m_doc->m_pageController )
|
||||
|
|
|
@ -143,6 +143,7 @@ class OKULARCORE_EXPORT Page
|
|||
/**
|
||||
* Returns whether the page of size @p width x @p height has a @p pixmap
|
||||
* in the region given by @p rect for the given @p observer
|
||||
* If there is a partially rendered pixmap the answer is false.
|
||||
*/
|
||||
bool hasPixmap( DocumentObserver *observer, int width = -1, int height = -1, const NormalizedRect &rect = NormalizedRect() ) const;
|
||||
|
||||
|
|
|
@ -146,6 +146,7 @@ class PagePrivate
|
|||
public:
|
||||
QPixmap *m_pixmap = nullptr;
|
||||
Rotation m_rotation;
|
||||
bool m_isPartialPixmap = false;
|
||||
};
|
||||
QMap< DocumentObserver*, PixmapObject > m_pixmaps;
|
||||
QMap< const DocumentObserver*, TilesManager *> m_tilesManagers;
|
||||
|
|
|
@ -81,6 +81,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.3" date="2020-03-05"/>
|
||||
<release version="1.9.2" date="2020-02-06"/>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
|
|
|
@ -84,6 +84,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.3" date="2020-03-05"/>
|
||||
<release version="1.9.2" date="2020-02-06"/>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
|
|
|
@ -81,6 +81,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.3" date="2020-03-05"/>
|
||||
<release version="1.9.2" date="2020-02-06"/>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
|
|
|
@ -83,6 +83,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.3" date="2020-03-05"/>
|
||||
<release version="1.9.2" date="2020-02-06"/>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
|
|
|
@ -81,6 +81,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.3" date="2020-03-05"/>
|
||||
<release version="1.9.2" date="2020-02-06"/>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
|
|
|
@ -82,6 +82,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.3" date="2020-03-05"/>
|
||||
<release version="1.9.2" date="2020-02-06"/>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
|
|
|
@ -81,6 +81,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.3" date="2020-03-05"/>
|
||||
<release version="1.9.2" date="2020-02-06"/>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
|
|
|
@ -104,6 +104,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.3" date="2020-03-05"/>
|
||||
<release version="1.9.2" date="2020-02-06"/>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
|
|
|
@ -79,6 +79,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.3" date="2020-03-05"/>
|
||||
<release version="1.9.2" date="2020-02-06"/>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
|
|
|
@ -104,6 +104,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.3" date="2020-03-05"/>
|
||||
<release version="1.9.2" date="2020-02-06"/>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
|
|
|
@ -79,6 +79,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.3" date="2020-03-05"/>
|
||||
<release version="1.9.2" date="2020-02-06"/>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
|
|
|
@ -81,6 +81,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.3" date="2020-03-05"/>
|
||||
<release version="1.9.2" date="2020-02-06"/>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
|
|
|
@ -84,6 +84,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.3" date="2020-03-05"/>
|
||||
<release version="1.9.2" date="2020-02-06"/>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
|
|
|
@ -88,6 +88,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.3" date="2020-03-05"/>
|
||||
<release version="1.9.2" date="2020-02-06"/>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
|
|
|
@ -81,6 +81,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.3" date="2020-03-05"/>
|
||||
<release version="1.9.2" date="2020-02-06"/>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
|
|
|
@ -80,6 +80,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.3" date="2020-03-05"/>
|
||||
<release version="1.9.2" date="2020-02-06"/>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
|
|
|
@ -81,6 +81,7 @@
|
|||
</mimetypes>
|
||||
<url type="homepage">https://okular.kde.org</url>
|
||||
<releases>
|
||||
<release version="1.9.3" date="2020-03-05"/>
|
||||
<release version="1.9.2" date="2020-02-06"/>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
|
|
|
@ -249,6 +249,7 @@
|
|||
<binary>okularkirigami</binary>
|
||||
</provides>
|
||||
<releases>
|
||||
<release version="1.9.3" date="2020-03-05"/>
|
||||
<release version="1.9.2" date="2020-02-06"/>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
|
|
|
@ -299,6 +299,7 @@
|
|||
<value key="KDE::windows_store">https://www.microsoft.com/store/apps/9n41msq1wnm8</value>
|
||||
</custom>
|
||||
<releases>
|
||||
<release version="1.9.3" date="2020-03-05"/>
|
||||
<release version="1.9.2" date="2020-02-06"/>
|
||||
<release version="1.9.1" date="2020-01-09"/>
|
||||
<release version="1.9.0" date="2019-12-12"/>
|
||||
|
|
Loading…
Reference in a new issue