diff options
| author | Crystalwarrior <varsash@gmail.com> | 2019-09-28 20:43:19 +0300 |
|---|---|---|
| committer | Crystalwarrior <varsash@gmail.com> | 2019-09-28 20:43:19 +0300 |
| commit | 709ebb7e1872394731c2edb282a1ce73fdc353f9 (patch) | |
| tree | 53edbdb1c05d5737a4e1df35e76c8cf721e15b07 /include | |
| parent | d3a58770d3b923d488b5df090c8e98edf5bf0b2b (diff) | |
Fix AOEvidenceDisplay not respecting the size of the viewport properly and breaking if a static image was used for evidence appearance
Fix an issue with chat message being resized before the chat box is in reload theme
Diffstat (limited to 'include')
| -rw-r--r-- | include/aoevidencedisplay.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/aoevidencedisplay.h b/include/aoevidencedisplay.h index 13ca00d5..93455c09 100644 --- a/include/aoevidencedisplay.h +++ b/include/aoevidencedisplay.h @@ -3,9 +3,9 @@ #include "aoapplication.h" #include "aosfxplayer.h" +#include "aomovie.h" #include <QLabel> -#include <QMovie> #include <QDebug> class AOEvidenceDisplay : public QLabel @@ -18,15 +18,16 @@ public: void show_evidence(QString p_evidence_image, bool is_left_side, int p_volume); QLabel* get_evidence_icon(); void reset(); + void combo_resize(int w, int h); private: AOApplication *ao_app; - QMovie *evidence_movie; + AOMovie *evidence_movie; QLabel *evidence_icon; AOSfxPlayer *sfx_player; private slots: - void frame_change(int p_frame); + void show_done(); }; #endif // AOEVIDENCEDISPLAY_H |
