\r
void MainWindow::changeFontSize(int diff)\r
{\r
+ qDebug() << "MainWindow::changeFontSize(;";\r
+\r
QSettings settings;\r
QFont font;\r
\r
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
{\r
QString ksq = KeyEventToSequence(event);\r
\r
- qDebug() << ">>>>> キーイベントを受信" << ksq << "<<<<<";\r
+ qDebug() << ">>>>> キーイベントを受信(MainWindow)" << ksq << "<<<<<";\r
\r
if (ProcessShortcut(ksq, this)) {\r
event->accept();\r
//>>>>> 「等倍」メニュー
m_scaleNormal = new QAction(tr("等倍"), this);
- m_scaleNormal->setObjectName("scaleUp");
+ m_scaleNormal->setObjectName("scaleNormal");
shortcuts.clear();
shortcuts << QKeySequence("=");
shortcuts << QKeySequence("Shift+=");
return true;
}
+void SimpleImageView::changeScale(bool up)
+{
+ if (up) {
+ scaleUp();
+ }
+ else {
+ scaleDown();
+ }
+}
+
double SimpleImageView::scaleFactor(const QSize &size)
{
double scaleFactor;
double SimpleImageView::resizeImage()
{
+ if (m_imgSrc.isNull()) {
+ return 1;
+ }
+
double scaleFactor = this->scaleFactor(viewport()->size());
m_rotateDeg %= 360;
void SimpleImageView::resizeEvent(QResizeEvent *event)
{
- if (!m_imgSrc.isNull()) {
- resizeImage();
- }
+ resizeImage();
QGraphicsView::resizeEvent(event);
}
bool setSource(const QString &path);
+ void changeScale(bool up);
+
private:
QAction *m_back;
QAction *m_fitToWindow;
#ifndef VERSION_H
#define VERSION_H
-#define VERSION_VALUE 0.18
+#define VERSION_VALUE 0.19
#endif // VERSION_H