diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2019-10-13 15:10:33 +0200 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2019-11-23 20:06:15 +0100 |
| commit | a83ae7e95fcb21f0f61cdb7d8cf9e4c4985bd853 (patch) | |
| tree | 524579f023af97d65646b085db180f6db6ae7edc /src | |
| parent | 0fd2199112be88a17125ea5630ce6184eb0758ca (diff) | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dialogs/ImageOverlay.cpp | 1 | ||||
| -rw-r--r-- | src/timeline2/TimelineModel.cpp | 4 |
2 files changed, 2 insertions, 3 deletions
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 |