Swiftdiff options
Diffstat (limited to 'Swift/QtUI/ScreenSharing/RemoteScreenViewerWidget.cpp')
| -rw-r--r-- | Swift/QtUI/ScreenSharing/RemoteScreenViewerWidget.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/Swift/QtUI/ScreenSharing/RemoteScreenViewerWidget.cpp b/Swift/QtUI/ScreenSharing/RemoteScreenViewerWidget.cpp index 7bb3f26..899f335 100644 --- a/Swift/QtUI/ScreenSharing/RemoteScreenViewerWidget.cpp +++ b/Swift/QtUI/ScreenSharing/RemoteScreenViewerWidget.cpp @@ -18,7 +18,7 @@ namespace Swift { RemoteScreenViewerWidget::RemoteScreenViewerWidget(boost::shared_ptr<IncomingScreenSharing> incScreenSharing, QWidget *parent) : - QFrame(parent), iss(incScreenSharing) + QWidget(parent), iss(incScreenSharing) { iss->onNewImageReceived.connect(boost::bind(&RemoteScreenViewerWidget::handleNewImageReceived, this, _1)); } @@ -30,7 +30,6 @@ RemoteScreenViewerWidget::~RemoteScreenViewerWidget() void RemoteScreenViewerWidget::paintEvent(QPaintEvent* event) { - QFrame::paintEvent(event); if (!pixmap.isNull()) { QPainter painter(this); painter.translate(geometry().center()); @@ -41,19 +40,15 @@ void RemoteScreenViewerWidget::paintEvent(QPaintEvent* event) void RemoteScreenViewerWidget::resizeEvent(QResizeEvent *event) { if (!pixmap.isNull()) { - int frameWidth2 = frameWidth() * 2; - QSize borders(frameWidth2, frameWidth2); - pixmap = pixmap.scaled(event->size() - borders, Qt::KeepAspectRatio); + pixmap = pixmap.scaled(event->size(), Qt::KeepAspectRatio); } - QFrame::resizeEvent(event); + QWidget::resizeEvent(event); } void RemoteScreenViewerWidget::handleNewImageReceived(const Image& image) { QImage qImg(image.data.data(), image.width, image.height, QImage::Format_RGB888); - int frameWidth2 = frameWidth() * 2; - QSize borders(frameWidth2, frameWidth2); - pixmap = QPixmap::fromImage(qImg).scaled(size() - borders, Qt::KeepAspectRatio); + pixmap = QPixmap::fromImage(qImg).scaled(size(), Qt::KeepAspectRatio); update(); } |