blumia/pineapple-pictures
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: tweak fit-in-view menu action behavior

Browse Source
This commit is contained in:
Gary Wang
2021-06-07 14:06:57 +08:00
parent 635199b85b
commit 4c07a89ca3
4 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/graphicsview.cpp
View File

@ -75,35 +75,35 @@ void GraphicsView::showImage(const QPixmap &pixmap)
{
resetTransform();
scene()->showImage(pixmap);
checkAndDoFitInView();
displayScene();
}
void GraphicsView::showImage(const QImage &image)
{
resetTransform();
scene()->showImage(QPixmap::fromImage(image));
checkAndDoFitInView();
displayScene();
}
void GraphicsView::showText(const QString &text)
{
resetTransform();
scene()->showText(text);
checkAndDoFitInView();
displayScene();
}
void GraphicsView::showSvg(const QString &filepath)
{
resetTransform();
scene()->showSvg(filepath);
checkAndDoFitInView();
displayScene();
}
void GraphicsView::showAnimated(const QString &filepath)
{
resetTransform();
scene()->showAnimated(filepath);
checkAndDoFitInView();
displayScene();
}
GraphicsScene *GraphicsView::scene() const
@ -196,15 +196,21 @@ void GraphicsView::fitByOrientation(Qt::Orientation ori, bool scaleDownOnly)
emit navigatorViewRequired(!isThingSmallerThanWindowWith(transform()), transform());
}
void GraphicsView::checkAndDoFitInView(bool markItOnAnyway)
void GraphicsView::displayScene()
{
if (!isThingSmallerThanWindowWith(transform())) {
m_enableFitInView = true;
if (isSceneBiggerThanView()) {
fitInView(sceneRect(), Qt::KeepAspectRatio);
}
if (markItOnAnyway) {
m_enableFitInView = true;
m_enableFitInView = true;
}
bool GraphicsView::isSceneBiggerThanView() const
{
if (!isThingSmallerThanWindowWith(transform())) {
return true;
} else {
return false;
}
}