diff --git a/displayarea.cpp b/displayarea.cpp index 69b68ba..8f62f68 100644 --- a/displayarea.cpp +++ b/displayarea.cpp @@ -37,6 +37,8 @@ void DisplayArea::resizeImage(QImage *image, const QSize &newSize) { if(image->size()==newSize) return; + resize(newSize); + QImage newImage(newSize,QImage::Format_ARGB32); newImage.fill(qRgba(255,255,255,0)); QPainter painter(&newImage); diff --git a/mainwindow.cpp b/mainwindow.cpp index 70e3d76..fe60621 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -10,16 +10,22 @@ #include #include #include +#include +#include MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent),displayArea(new DisplayArea(this)) { - setCentralWidget(displayArea); + displayArea->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored); + scrollArea = new QScrollArea(); + scrollArea->setWidget(displayArea); + setCentralWidget(scrollArea); createActions(); createMenus(); setWindowTitle(tr("LivePow")); + resize(QGuiApplication::primaryScreen()->availableSize() * 3 / 5); } MainWindow::~MainWindow() diff --git a/mainwindow.h b/mainwindow.h index 5514e10..f12c593 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -3,6 +3,7 @@ #include #include +#include class DisplayArea; class InputParser; @@ -20,6 +21,7 @@ public: InputParser *parser; private: + QScrollArea *scrollArea; DisplayArea *displayArea; void createActions(); void createMenus();