diff options
author | Jonas Schnelli <dev@jonasschnelli.ch> | 2020-05-29 10:30:27 +0200 |
---|---|---|
committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2020-05-29 10:30:36 +0200 |
commit | beb3844c45c57cdc0ae715c8fe22e1c310d82662 (patch) | |
tree | 8179f4eed99ec229a5eea3dfd0011f0b8ec6aece /src/qt/modaloverlay.h | |
parent | 0d5c18204b73ccb0d7c07f90c52de31edc25e28e (diff) | |
parent | 4fc1df41d570ab631a8b47e4427a0b84305e37d1 (diff) |
Merge #17968: qt: Ensure that ModalOverlay is resized properly
4fc1df41d570ab631a8b47e4427a0b84305e37d1 qt: Track QEvent::Resize during animation (Hennadii Stepanov)
Pull request description:
In certain circumstances the `ModalOverlay` widget is not sized properly:
- #17269
- #17967
- https://github.com/bitcoin/bitcoin/pull/17968#pullrequestreview-350753107
On master (f018d0c9cd7f408dac016b6bfc873670de713d27) this bug looks like this:
![DeepinScreenshot_bitcoin-qt_20200120193402](https://user-images.githubusercontent.com/32963518/72748165-298b2a80-3bbf-11ea-810d-2966f08e496a.png)
With this PR the wallet frame looks ok:
![DeepinScreenshot_bitcoin-qt_20200120195241](https://user-images.githubusercontent.com/32963518/72748388-c64dc800-3bbf-11ea-8875-1ba1899b3513.png)
Fix #17269
Fix #17967
ACKs for top commit:
promag:
Code review ACK 4fc1df41d570ab631a8b47e4427a0b84305e37d1.
jonasschnelli:
utACK 4fc1df41d570ab631a8b47e4427a0b84305e37d1
Tree-SHA512: b5d303fbc139c9383cd22edecba05e51b0d6115631aeb7d4474e973e7250a84019c11c0e41b5200e4d9ab10e17908774b45234317535857dc5314c3c28614ad4
Diffstat (limited to 'src/qt/modaloverlay.h')
-rw-r--r-- | src/qt/modaloverlay.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qt/modaloverlay.h b/src/qt/modaloverlay.h index a565d7d8f3..1d84046d3d 100644 --- a/src/qt/modaloverlay.h +++ b/src/qt/modaloverlay.h @@ -6,6 +6,7 @@ #define BITCOIN_QT_MODALOVERLAY_H #include <QDateTime> +#include <QPropertyAnimation> #include <QWidget> //! The required delta of headers to the estimated number of available headers until we show the IBD progress @@ -45,6 +46,7 @@ private: QVector<QPair<qint64, double> > blockProcessTime; bool layerIsVisible; bool userClosed; + QPropertyAnimation m_animation; void UpdateHeaderSyncLabel(); }; |