From c0a010acbb7f0045aa1ce33f82b0d537a715a886 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Thu, 4 Jul 2019 21:20:19 -0400 Subject: Fix deprecated function call issues with Qt 5.13 Update to mtxclient 0.3.0 --- src/dialogs/ImageOverlay.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/dialogs/ImageOverlay.cpp') diff --git a/src/dialogs/ImageOverlay.cpp b/src/dialogs/ImageOverlay.cpp index dbf5bbe4..dd9cd03a 100644 --- a/src/dialogs/ImageOverlay.cpp +++ b/src/dialogs/ImageOverlay.cpp @@ -17,7 +17,9 @@ #include #include +#include #include +#include #include "dialogs/ImageOverlay.h" @@ -39,7 +41,8 @@ ImageOverlay::ImageOverlay(QPixmap image, QWidget *parent) setAttribute(Qt::WA_DeleteOnClose, true); setWindowState(Qt::WindowFullScreen); - screen_ = QApplication::desktop()->availableGeometry(); + // Deprecated in 5.13: screen_ = QApplication::desktop()->availableGeometry(); + screen_ = QGuiApplication::primaryScreen()->availableGeometry(); move(QApplication::desktop()->mapToGlobal(screen_.topLeft())); resize(screen_.size()); -- cgit 1.5.1 From a83ae7e95fcb21f0f61cdb7d8cf9e4c4985bd853 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sun, 13 Oct 2019 15:10:33 +0200 Subject: Fix section layout issues and pagination issues Pagination could get stuck, if the messages request failed. Section height seemes to have been calculated to late, which would make some section overlap the next message in some cases. Fix that by doing the height calculation manually. --- resources/qml/TimelineView.qml | 5 ++--- src/dialogs/ImageOverlay.cpp | 1 - src/timeline2/TimelineModel.cpp | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/dialogs/ImageOverlay.cpp') diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml index ef1db0f0..b0a8853e 100644 --- a/resources/qml/TimelineView.qml +++ b/resources/qml/TimelineView.qml @@ -68,7 +68,7 @@ Rectangle { model.currentIndex = newIndex } - if (contentHeight < height) { + if (contentHeight < height && model) { model.fetchHistory(); } } @@ -143,8 +143,7 @@ Rectangle { spacing: 8 width: parent.width - - Component.onCompleted: chat.forceLayout() + height: (section.includes(" ") ? dateBubble.height + 8 + userName.height : userName.height) + 8 Label { id: dateBubble diff --git a/src/dialogs/ImageOverlay.cpp b/src/dialogs/ImageOverlay.cpp index dd9cd03a..cbdd351c 100644 --- a/src/dialogs/ImageOverlay.cpp +++ b/src/dialogs/ImageOverlay.cpp @@ -41,7 +41,6 @@ ImageOverlay::ImageOverlay(QPixmap image, QWidget *parent) setAttribute(Qt::WA_DeleteOnClose, true); setWindowState(Qt::WindowFullScreen); - // Deprecated in 5.13: screen_ = QApplication::desktop()->availableGeometry(); screen_ = QGuiApplication::primaryScreen()->availableGeometry(); move(QApplication::desktop()->mapToGlobal(screen_.topLeft())); diff --git a/src/timeline2/TimelineModel.cpp b/src/timeline2/TimelineModel.cpp index 27bd09b6..b37ade54 100644 --- a/src/timeline2/TimelineModel.cpp +++ b/src/timeline2/TimelineModel.cpp @@ -618,10 +618,12 @@ TimelineModel::fetchHistory() opts.room_id, mtx::errors::to_string(err->matrix_error.errcode), err->matrix_error.error); + paginationInProgress = false; return; } emit oldMessagesRetrieved(std::move(res)); + paginationInProgress = false; }); } @@ -658,8 +660,6 @@ TimelineModel::addBackwardsEvents(const mtx::responses::Messages &msgs) } prev_batch_token_ = QString::fromStdString(msgs.end); - - paginationInProgress = false; } QColor -- cgit 1.5.1 From 7ccc120f6345bff8dad4abb349669973746aa8da Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Tue, 4 Feb 2020 04:58:43 +0100 Subject: modernize: use nullptr --- src/ChatPage.h | 2 +- src/LoginPage.cpp | 2 +- src/LoginPage.h | 2 +- src/MainWindow.h | 2 +- src/RegisterPage.cpp | 8 ++++---- src/RegisterPage.h | 2 +- src/RoomInfoListItem.h | 2 +- src/RoomList.h | 2 +- src/TextInputWidget.h | 2 +- src/TopRoomBar.h | 2 +- src/UserInfoWidget.h | 2 +- src/UserSettingsPage.h | 2 +- src/WelcomePage.h | 2 +- src/dialogs/ImageOverlay.cpp | 2 +- src/popups/ReplyPopup.cpp | 6 +++--- src/popups/SuggestionsPopup.h | 2 +- src/timeline/TimelineModel.h | 2 +- src/timeline/TimelineViewManager.h | 2 +- src/ui/Avatar.h | 2 +- src/ui/Badge.h | 6 +++--- src/ui/FlatButton.h | 6 +++--- src/ui/LoadingIndicator.h | 2 +- src/ui/RaisedButton.h | 4 ++-- src/ui/Ripple.cpp | 2 +- src/ui/Ripple.h | 4 ++-- src/ui/RippleOverlay.h | 2 +- src/ui/TextField.cpp | 8 ++++---- src/ui/TextField.h | 2 +- src/ui/Theme.h | 2 +- 29 files changed, 43 insertions(+), 43 deletions(-) (limited to 'src/dialogs/ImageOverlay.cpp') diff --git a/src/ChatPage.h b/src/ChatPage.h index 9bc5fb73..8e2e9192 100644 --- a/src/ChatPage.h +++ b/src/ChatPage.h @@ -65,7 +65,7 @@ class ChatPage : public QWidget Q_OBJECT public: - ChatPage(QSharedPointer userSettings, QWidget *parent = 0); + ChatPage(QSharedPointer userSettings, QWidget *parent = nullptr); // Initialize all the components of the UI. void bootstrap(QString userid, QString homeserver, QString token); diff --git a/src/LoginPage.cpp b/src/LoginPage.cpp index c06137c9..c3919b93 100644 --- a/src/LoginPage.cpp +++ b/src/LoginPage.cpp @@ -111,7 +111,7 @@ LoginPage::LoginPage(QWidget *parent) form_layout_->addLayout(matrixidLayout_); form_layout_->addWidget(password_input_); - form_layout_->addWidget(deviceName_, Qt::AlignHCenter, 0); + form_layout_->addWidget(deviceName_, Qt::AlignHCenter, nullptr); form_layout_->addLayout(serverLayout_); button_layout_ = new QHBoxLayout(); diff --git a/src/LoginPage.h b/src/LoginPage.h index 99c249b1..4b84abfc 100644 --- a/src/LoginPage.h +++ b/src/LoginPage.h @@ -38,7 +38,7 @@ class LoginPage : public QWidget Q_OBJECT public: - LoginPage(QWidget *parent = 0); + LoginPage(QWidget *parent = nullptr); void reset(); diff --git a/src/MainWindow.h b/src/MainWindow.h index 1aadbf4d..59f29d50 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -62,7 +62,7 @@ class MainWindow : public QMainWindow Q_OBJECT public: - explicit MainWindow(QWidget *parent = 0); + explicit MainWindow(QWidget *parent = nullptr); static MainWindow *instance() { return instance_; }; void saveCurrentWindowSize(); diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp index 76721036..2688e9a9 100644 --- a/src/RegisterPage.cpp +++ b/src/RegisterPage.cpp @@ -90,10 +90,10 @@ RegisterPage::RegisterPage(QWidget *parent) server_input_ = new TextField(); server_input_->setLabel(tr("Home Server")); - form_layout_->addWidget(username_input_, Qt::AlignHCenter, 0); - form_layout_->addWidget(password_input_, Qt::AlignHCenter, 0); - form_layout_->addWidget(password_confirmation_, Qt::AlignHCenter, 0); - form_layout_->addWidget(server_input_, Qt::AlignHCenter, 0); + form_layout_->addWidget(username_input_, Qt::AlignHCenter, nullptr); + form_layout_->addWidget(password_input_, Qt::AlignHCenter, nullptr); + form_layout_->addWidget(password_confirmation_, Qt::AlignHCenter, nullptr); + form_layout_->addWidget(server_input_, Qt::AlignHCenter, nullptr); button_layout_ = new QHBoxLayout(); button_layout_->setSpacing(0); diff --git a/src/RegisterPage.h b/src/RegisterPage.h index b05cf150..96a5b3ca 100644 --- a/src/RegisterPage.h +++ b/src/RegisterPage.h @@ -30,7 +30,7 @@ class RegisterPage : public QWidget Q_OBJECT public: - RegisterPage(QWidget *parent = 0); + RegisterPage(QWidget *parent = nullptr); protected: void paintEvent(QPaintEvent *event) override; diff --git a/src/RoomInfoListItem.h b/src/RoomInfoListItem.h index 16553c73..5cb9e83c 100644 --- a/src/RoomInfoListItem.h +++ b/src/RoomInfoListItem.h @@ -65,7 +65,7 @@ class RoomInfoListItem : public QWidget Q_PROPERTY(QColor btnTextColor READ btnTextColor WRITE setBtnTextColor) public: - RoomInfoListItem(QString room_id, const RoomInfo &info, QWidget *parent = 0); + RoomInfoListItem(QString room_id, const RoomInfo &info, QWidget *parent = nullptr); void updateUnreadMessageCount(int count, int highlightedCount); void clearUnreadMessageCount() { updateUnreadMessageCount(0, 0); }; diff --git a/src/RoomList.h b/src/RoomList.h index 51a24043..fef552c6 100644 --- a/src/RoomList.h +++ b/src/RoomList.h @@ -35,7 +35,7 @@ class RoomList : public QWidget Q_OBJECT public: - explicit RoomList(QWidget *parent = 0); + explicit RoomList(QWidget *parent = nullptr); void initialize(const QMap &info); void sync(const std::map &info); diff --git a/src/TextInputWidget.h b/src/TextInputWidget.h index 3674ee0d..ac79be8b 100644 --- a/src/TextInputWidget.h +++ b/src/TextInputWidget.h @@ -142,7 +142,7 @@ class TextInputWidget : public QWidget Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor) public: - TextInputWidget(QWidget *parent = 0); + TextInputWidget(QWidget *parent = nullptr); void stopTyping(); diff --git a/src/TopRoomBar.h b/src/TopRoomBar.h index 5ab25f39..63ce847e 100644 --- a/src/TopRoomBar.h +++ b/src/TopRoomBar.h @@ -40,7 +40,7 @@ class TopRoomBar : public QWidget Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor) public: - TopRoomBar(QWidget *parent = 0); + TopRoomBar(QWidget *parent = nullptr); void updateRoomAvatar(const QString &avatar_image); void updateRoomAvatar(const QIcon &icon); diff --git a/src/UserInfoWidget.h b/src/UserInfoWidget.h index 263dd0c2..e1a925a4 100644 --- a/src/UserInfoWidget.h +++ b/src/UserInfoWidget.h @@ -31,7 +31,7 @@ class UserInfoWidget : public QWidget Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor) public: - UserInfoWidget(QWidget *parent = 0); + UserInfoWidget(QWidget *parent = nullptr); void setDisplayName(const QString &name); void setUserId(const QString &userid); diff --git a/src/UserSettingsPage.h b/src/UserSettingsPage.h index 8658e80e..299905ab 100644 --- a/src/UserSettingsPage.h +++ b/src/UserSettingsPage.h @@ -147,7 +147,7 @@ class UserSettingsPage : public QWidget Q_OBJECT public: - UserSettingsPage(QSharedPointer settings, QWidget *parent = 0); + UserSettingsPage(QSharedPointer settings, QWidget *parent = nullptr); protected: void showEvent(QShowEvent *event) override; diff --git a/src/WelcomePage.h b/src/WelcomePage.h index 480dc702..ae660215 100644 --- a/src/WelcomePage.h +++ b/src/WelcomePage.h @@ -7,7 +7,7 @@ class WelcomePage : public QWidget Q_OBJECT public: - explicit WelcomePage(QWidget *parent = 0); + explicit WelcomePage(QWidget *parent = nullptr); protected: void paintEvent(QPaintEvent *) override; diff --git a/src/dialogs/ImageOverlay.cpp b/src/dialogs/ImageOverlay.cpp index cbdd351c..a98c39c2 100644 --- a/src/dialogs/ImageOverlay.cpp +++ b/src/dialogs/ImageOverlay.cpp @@ -32,7 +32,7 @@ ImageOverlay::ImageOverlay(QPixmap image, QWidget *parent) , originalImage_{image} { setMouseTracking(true); - setParent(0); + setParent(nullptr); setWindowFlags(windowFlags() | Qt::FramelessWindowHint); diff --git a/src/popups/ReplyPopup.cpp b/src/popups/ReplyPopup.cpp index 42a5a6d3..5058c039 100644 --- a/src/popups/ReplyPopup.cpp +++ b/src/popups/ReplyPopup.cpp @@ -13,9 +13,9 @@ ReplyPopup::ReplyPopup(QWidget *parent) : QWidget(parent) - , userItem_{0} - , msgLabel_{0} - , eventLabel_{0} + , userItem_{nullptr} + , msgLabel_{nullptr} + , eventLabel_{nullptr} { setAttribute(Qt::WA_ShowWithoutActivating, true); setWindowFlags(Qt::ToolTip | Qt::NoDropShadowWindowHint); diff --git a/src/popups/SuggestionsPopup.h b/src/popups/SuggestionsPopup.h index dcd054f8..f84870e7 100644 --- a/src/popups/SuggestionsPopup.h +++ b/src/popups/SuggestionsPopup.h @@ -59,7 +59,7 @@ private: size_t posToRemove = layout_->count() - 1; QLayoutItem *item; - while (startingPos <= posToRemove && (item = layout_->takeAt(posToRemove)) != 0) { + while (startingPos <= posToRemove && (item = layout_->takeAt(posToRemove)) != nullptr) { delete item->widget(); delete item; diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h index fb32f0fb..2d0e9627 100644 --- a/src/timeline/TimelineModel.h +++ b/src/timeline/TimelineModel.h @@ -126,7 +126,7 @@ class TimelineModel : public QAbstractListModel typingUsersChanged) public: - explicit TimelineModel(TimelineViewManager *manager, QString room_id, QObject *parent = 0); + explicit TimelineModel(TimelineViewManager *manager, QString room_id, QObject *parent = nullptr); enum Roles { diff --git a/src/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h index 5880a382..8552d6b3 100644 --- a/src/timeline/TimelineViewManager.h +++ b/src/timeline/TimelineViewManager.h @@ -29,7 +29,7 @@ class TimelineViewManager : public QObject replyingEventChanged) public: - TimelineViewManager(QSharedPointer userSettings, QWidget *parent = 0); + TimelineViewManager(QSharedPointer userSettings, QWidget *parent = nullptr); QWidget *getWidget() const { return container; } void sync(const mtx::responses::Rooms &rooms); diff --git a/src/ui/Avatar.h b/src/ui/Avatar.h index a643c8c4..d6d0b5c7 100644 --- a/src/ui/Avatar.h +++ b/src/ui/Avatar.h @@ -15,7 +15,7 @@ class Avatar : public QWidget Q_PROPERTY(QColor backgroundColor WRITE setBackgroundColor READ backgroundColor) public: - explicit Avatar(QWidget *parent = 0, int size = ui::AvatarSize); + explicit Avatar(QWidget *parent = nullptr, int size = ui::AvatarSize); void setBackgroundColor(const QColor &color); void setIcon(const QIcon &icon); diff --git a/src/ui/Badge.h b/src/ui/Badge.h index fd73ad30..748b56fd 100644 --- a/src/ui/Badge.h +++ b/src/ui/Badge.h @@ -16,9 +16,9 @@ class Badge : public OverlayWidget Q_PROPERTY(QPointF relativePosition WRITE setRelativePosition READ relativePosition) public: - explicit Badge(QWidget *parent = 0); - explicit Badge(const QIcon &icon, QWidget *parent = 0); - explicit Badge(const QString &text, QWidget *parent = 0); + explicit Badge(QWidget *parent = nullptr); + explicit Badge(const QIcon &icon, QWidget *parent = nullptr); + explicit Badge(const QString &text, QWidget *parent = nullptr); void setBackgroundColor(const QColor &color); void setTextColor(const QColor &color); diff --git a/src/ui/FlatButton.h b/src/ui/FlatButton.h index d29903c2..764df6e9 100644 --- a/src/ui/FlatButton.h +++ b/src/ui/FlatButton.h @@ -91,14 +91,14 @@ class FlatButton : public QPushButton Q_PROPERTY(qreal fontSize WRITE setFontSize READ fontSize) public: - explicit FlatButton(QWidget *parent = 0, + explicit FlatButton(QWidget *parent = nullptr, ui::ButtonPreset preset = ui::ButtonPreset::FlatPreset); explicit FlatButton(const QString &text, - QWidget *parent = 0, + QWidget *parent = nullptr, ui::ButtonPreset preset = ui::ButtonPreset::FlatPreset); FlatButton(const QString &text, ui::Role role, - QWidget *parent = 0, + QWidget *parent = nullptr, ui::ButtonPreset preset = ui::ButtonPreset::FlatPreset); ~FlatButton(); diff --git a/src/ui/LoadingIndicator.h b/src/ui/LoadingIndicator.h index 1585098e..e72a8c48 100644 --- a/src/ui/LoadingIndicator.h +++ b/src/ui/LoadingIndicator.h @@ -12,7 +12,7 @@ class LoadingIndicator : public QWidget Q_PROPERTY(QColor color READ color WRITE setColor) public: - LoadingIndicator(QWidget *parent = 0); + LoadingIndicator(QWidget *parent = nullptr); void paintEvent(QPaintEvent *e); diff --git a/src/ui/RaisedButton.h b/src/ui/RaisedButton.h index edd5ee4a..74543262 100644 --- a/src/ui/RaisedButton.h +++ b/src/ui/RaisedButton.h @@ -11,8 +11,8 @@ class RaisedButton : public FlatButton Q_OBJECT public: - explicit RaisedButton(QWidget *parent = 0); - explicit RaisedButton(const QString &text, QWidget *parent = 0); + explicit RaisedButton(QWidget *parent = nullptr); + explicit RaisedButton(const QString &text, QWidget *parent = nullptr); ~RaisedButton(); protected: diff --git a/src/ui/Ripple.cpp b/src/ui/Ripple.cpp index e22c4a62..ef8a62dd 100644 --- a/src/ui/Ripple.cpp +++ b/src/ui/Ripple.cpp @@ -3,7 +3,7 @@ Ripple::Ripple(const QPoint ¢er, QObject *parent) : QParallelAnimationGroup(parent) - , overlay_(0) + , overlay_(nullptr) , radius_anim_(animate("radius")) , opacity_anim_(animate("opacity")) , radius_(0) diff --git a/src/ui/Ripple.h b/src/ui/Ripple.h index 9184f061..3701fb6c 100644 --- a/src/ui/Ripple.h +++ b/src/ui/Ripple.h @@ -16,8 +16,8 @@ class Ripple : public QParallelAnimationGroup Q_PROPERTY(qreal opacity WRITE setOpacity READ opacity) public: - explicit Ripple(const QPoint ¢er, QObject *parent = 0); - Ripple(const QPoint ¢er, RippleOverlay *overlay, QObject *parent = 0); + explicit Ripple(const QPoint ¢er, QObject *parent = nullptr); + Ripple(const QPoint ¢er, RippleOverlay *overlay, QObject *parent = nullptr); inline void setOverlay(RippleOverlay *overlay); diff --git a/src/ui/RippleOverlay.h b/src/ui/RippleOverlay.h index 9ef91fbf..5d12aff7 100644 --- a/src/ui/RippleOverlay.h +++ b/src/ui/RippleOverlay.h @@ -11,7 +11,7 @@ class RippleOverlay : public OverlayWidget Q_OBJECT public: - explicit RippleOverlay(QWidget *parent = 0); + explicit RippleOverlay(QWidget *parent = nullptr); void addRipple(Ripple *ripple); void addRipple(const QPoint &position, qreal radius = 300); diff --git a/src/ui/TextField.cpp b/src/ui/TextField.cpp index 0ae2516d..6c1552a8 100644 --- a/src/ui/TextField.cpp +++ b/src/ui/TextField.cpp @@ -16,7 +16,7 @@ TextField::TextField(QWidget *parent) QPalette pal; state_machine_ = new TextFieldStateMachine(this); - label_ = 0; + label_ = nullptr; label_font_size_ = 15; show_label_ = false; background_color_ = pal.color(QPalette::Window); @@ -230,9 +230,9 @@ TextFieldStateMachine::TextFieldStateMachine(TextField *parent) normal_state_ = new QState; focused_state_ = new QState; - label_ = 0; - offset_anim_ = 0; - color_anim_ = 0; + label_ = nullptr; + offset_anim_ = nullptr; + color_anim_ = nullptr; progress_ = 0.0; addState(normal_state_); diff --git a/src/ui/TextField.h b/src/ui/TextField.h index 1675a2e0..100fed31 100644 --- a/src/ui/TextField.h +++ b/src/ui/TextField.h @@ -22,7 +22,7 @@ class TextField : public QLineEdit Q_PROPERTY(QColor backgroundColor WRITE setBackgroundColor READ backgroundColor) public: - explicit TextField(QWidget *parent = 0); + explicit TextField(QWidget *parent = nullptr); void setInkColor(const QColor &color); void setBackgroundColor(const QColor &color); diff --git a/src/ui/Theme.h b/src/ui/Theme.h index d1d7e2a6..ecff02b5 100644 --- a/src/ui/Theme.h +++ b/src/ui/Theme.h @@ -78,7 +78,7 @@ class Theme : public QObject { Q_OBJECT public: - explicit Theme(QObject *parent = 0); + explicit Theme(QObject *parent = nullptr); QColor getColor(const QString &key) const; -- cgit 1.5.1 From 95c25252180cd25a35a290948491fd9c2f899caf Mon Sep 17 00:00:00 2001 From: Adasauce Date: Wed, 12 Feb 2020 20:50:52 -0400 Subject: Remove move() in ImageOverlay it was causing the full screen image overlay to appear on the "primary display" vs. the actual display nheko is running on. removing the move() call makes the overlay follow the window. --- src/dialogs/ImageOverlay.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/dialogs/ImageOverlay.cpp') diff --git a/src/dialogs/ImageOverlay.cpp b/src/dialogs/ImageOverlay.cpp index a98c39c2..b1b7ea74 100644 --- a/src/dialogs/ImageOverlay.cpp +++ b/src/dialogs/ImageOverlay.cpp @@ -43,7 +43,6 @@ ImageOverlay::ImageOverlay(QPixmap image, QWidget *parent) screen_ = QGuiApplication::primaryScreen()->availableGeometry(); - move(QApplication::desktop()->mapToGlobal(screen_.topLeft())); resize(screen_.size()); connect(this, SIGNAL(closing()), this, SLOT(close())); -- cgit 1.5.1 From a2566b870e96c5c1fbc4d540bad7f38149a86109 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Thu, 13 Feb 2020 15:11:15 +0100 Subject: show image dialog fullscreen instead of resizing to the size of the first desktop --- src/dialogs/ImageOverlay.cpp | 17 ++++++----------- src/dialogs/ImageOverlay.h | 1 - src/timeline/TimelineViewManager.cpp | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) (limited to 'src/dialogs/ImageOverlay.cpp') diff --git a/src/dialogs/ImageOverlay.cpp b/src/dialogs/ImageOverlay.cpp index b1b7ea74..e075fb67 100644 --- a/src/dialogs/ImageOverlay.cpp +++ b/src/dialogs/ImageOverlay.cpp @@ -41,10 +41,6 @@ ImageOverlay::ImageOverlay(QPixmap image, QWidget *parent) setAttribute(Qt::WA_DeleteOnClose, true); setWindowState(Qt::WindowFullScreen); - screen_ = QGuiApplication::primaryScreen()->availableGeometry(); - - resize(screen_.size()); - connect(this, SIGNAL(closing()), this, SLOT(close())); raise(); @@ -59,15 +55,15 @@ ImageOverlay::paintEvent(QPaintEvent *event) painter.setRenderHint(QPainter::Antialiasing); // Full screen overlay. - painter.fillRect(QRect(0, 0, screen_.width(), screen_.height()), QColor(55, 55, 55, 170)); + painter.fillRect(QRect(0, 0, width(), height()), QColor(55, 55, 55, 170)); // Left and Right margins - int outer_margin = screen_.width() * 0.12; + int outer_margin = width() * 0.12; int buttonSize = 36; int margin = outer_margin * 0.1; - int max_width = screen_.width() - 2 * outer_margin; - int max_height = screen_.height(); + int max_width = width() - 2 * outer_margin; + int max_height = height(); image_ = utils::scaleDown(max_width, max_height, originalImage_); @@ -75,10 +71,9 @@ ImageOverlay::paintEvent(QPaintEvent *event) int diff_y = max_height - image_.height(); content_ = QRect(outer_margin + diff_x / 2, diff_y / 2, image_.width(), image_.height()); - close_button_ = - QRect(screen_.width() - margin - buttonSize, margin, buttonSize, buttonSize); + close_button_ = QRect(width() - margin - buttonSize, margin, buttonSize, buttonSize); save_button_ = - QRect(screen_.width() - (2 * margin) - (2 * buttonSize), margin, buttonSize, buttonSize); + QRect(width() - (2 * margin) - (2 * buttonSize), margin, buttonSize, buttonSize); // Draw main content_. painter.drawPixmap(content_, image_); diff --git a/src/dialogs/ImageOverlay.h b/src/dialogs/ImageOverlay.h index 26257fc1..bf566ce4 100644 --- a/src/dialogs/ImageOverlay.h +++ b/src/dialogs/ImageOverlay.h @@ -44,6 +44,5 @@ private: QRect content_; QRect close_button_; QRect save_button_; - QRect screen_; }; } // dialogs diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp index 37c56217..2426d810 100644 --- a/src/timeline/TimelineViewManager.cpp +++ b/src/timeline/TimelineViewManager.cpp @@ -158,7 +158,7 @@ TimelineViewManager::openImageOverlay(QString mxcUrl, QString eventId) const auto pixmap = QPixmap::fromImage(imgResponse->textureFactory()->image()); auto imgDialog = new dialogs::ImageOverlay(pixmap); - imgDialog->show(); + imgDialog->showFullScreen(); connect(imgDialog, &dialogs::ImageOverlay::saving, timeline_, [this, eventId]() { timeline_->saveMedia(eventId); }); -- cgit 1.5.1