Ver0.19

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 6955335..eb3142a 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1111,6 +1111,8 @@ void MainWindow::setFontSizeUp()
 \r
 void MainWindow::changeFontSize(int diff)\r
 {\r
+    qDebug() << "MainWindow::changeFontSize(;";\r
+\r
     QSettings settings;\r
     QFont font;\r
 \r
@@ -1139,6 +1141,13 @@ void MainWindow::changeFontSize(int diff)
         ui->pane2->textView()->updateAppearance();\r
         ui->pane3->textView()->updateAppearance();\r
     }\r
+\r
+    if (ui->pane1->imageView()->hasFocus() ||\r
+        ui->pane2->imageView()->hasFocus() ||\r
+        ui->pane3->imageView()->hasFocus())\r
+    {\r
+        ui->pane1->imageView()->changeScale(diff > 0);\r
+    }\r
 }\r
 \r
 void MainWindow::initBookmark()\r
@@ -1670,7 +1679,7 @@ void MainWindow::keyPressEvent(QKeyEvent *event)
 {\r
     QString ksq = KeyEventToSequence(event);\r
 \r
-    qDebug() << ">>>>> キーイベントを受信" << ksq << "<<<<<";\r
+    qDebug() << ">>>>> キーイベントを受信(MainWindow)" << ksq << "<<<<<";\r
 \r
     if (ProcessShortcut(ksq, this)) {\r
         event->accept();\r

diff --git a/simpleimageview.cpp b/simpleimageview.cpp
index 9ed65f3..142cb11 100644 (file)
--- a/simpleimageview.cpp
+++ b/simpleimageview.cpp
@@ -61,7 +61,7 @@ SimpleImageView::SimpleImageView(QWidget *parent) :
 
     //>>>>> 「等倍」メニュー
     m_scaleNormal = new QAction(tr("等倍"), this);
-    m_scaleNormal->setObjectName("scaleUp");
+    m_scaleNormal->setObjectName("scaleNormal");
     shortcuts.clear();
     shortcuts << QKeySequence("=");
     shortcuts << QKeySequence("Shift+=");
@@ -110,6 +110,16 @@ bool SimpleImageView::setSource(const QString &path)
     return true;
 }
 
+void SimpleImageView::changeScale(bool up)
+{
+    if (up) {
+        scaleUp();
+    }
+    else {
+        scaleDown();
+    }
+}
+
 double SimpleImageView::scaleFactor(const QSize &size)
 {
     double scaleFactor;
@@ -145,6 +155,10 @@ void SimpleImageView::sizeChanged()
 
 double SimpleImageView::resizeImage()
 {
+    if (m_imgSrc.isNull()) {
+        return 1;
+    }
+
     double scaleFactor = this->scaleFactor(viewport()->size());
     m_rotateDeg %= 360;
 
@@ -250,8 +264,6 @@ void SimpleImageView::contextMenuEvent(QContextMenuEvent *event)
 
 void SimpleImageView::resizeEvent(QResizeEvent *event)
 {
-    if (!m_imgSrc.isNull()) {
-        resizeImage();
-    }
+    resizeImage();
     QGraphicsView::resizeEvent(event);
 }

diff --git a/simpleimageview.h b/simpleimageview.h
index ef62295..58b6bef 100644 (file)
--- a/simpleimageview.h
+++ b/simpleimageview.h
@@ -11,6 +11,8 @@ public:
 
     bool setSource(const QString &path);
 
+    void changeScale(bool up);
+
 private:
     QAction *m_back;
     QAction *m_fitToWindow;

diff --git a/version.h b/version.h
index e15d89a..b23807a 100644 (file)
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define VERSION_VALUE   0.18
+#define VERSION_VALUE   0.19
 
 #endif // VERSION_H