procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed animation shutdown and some radial progresses

This commit is contained in:
John Preston 2015-12-25 18:21:18 +03:00
parent 9d28303459
commit 4a4fb00ec0
4 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Telegram/SourceFiles/gui/animation.cpp
View File

@ -500,14 +500,14 @@ public:
if (_frameMs + _currentFrameDelay < frameMs) { if (_frameMs + _currentFrameDelay < frameMs) {
_currentFrameDelay = int32(frameMs - _frameMs); _currentFrameDelay = int32(frameMs - _frameMs);
} }
_frameMs = frameMs;
if (duration == AV_NOPTS_VALUE) { if (duration == AV_NOPTS_VALUE) {
_nextFrameDelay = 0; _nextFrameDelay = 0;
} else { } else {
_nextFrameDelay = (duration * 1000LL * _fmtContext->streams[_streamId]->time_base.num) / _fmtContext->streams[_streamId]->time_base.den; _nextFrameDelay = (duration * 1000LL * _fmtContext->streams[_streamId]->time_base.num) / _fmtContext->streams[_streamId]->time_base.den;
} }
_frameMs = frameMs;
av_frame_unref(_frame); av_frame_unref(_frame);
return true; return true;
} }
@ -821,6 +821,7 @@ private:
ClipReadManager::ClipReadManager(QThread *thread) : _processingInThread(0), _needReProcess(false) { ClipReadManager::ClipReadManager(QThread *thread) : _processingInThread(0), _needReProcess(false) {
moveToThread(thread); moveToThread(thread);
connect(thread, SIGNAL(started()), this, SLOT(process())); connect(thread, SIGNAL(started()), this, SLOT(process()));
connect(thread, SIGNAL(finished()), this, SLOT(finish()));
connect(this, SIGNAL(processDelayed()), this, SLOT(process()), Qt::QueuedConnection); connect(this, SIGNAL(processDelayed()), this, SLOT(process()), Qt::QueuedConnection);
_timer.setSingleShot(true); _timer.setSingleShot(true);
@ -922,7 +923,7 @@ void ClipReadManager::process() {
return; return;
} }
_timer.stop(); _timer.stop();
_processingInThread = thread(); _processingInThread = thread();
uint64 ms = getms(), minms = ms + 86400 * 1000ULL; uint64 ms = getms(), minms = ms + 86400 * 1000ULL;
@ -977,19 +978,26 @@ void ClipReadManager::process() {
_processingInThread = 0; _processingInThread = 0;
} }
ClipReadManager::~ClipReadManager() { void ClipReadManager::finish() {
{ _timer.stop();
QMutexLocker lock(&_readerPointersMutex); clear();
for (ReaderPointers::iterator i = _readerPointers.begin(), e = _readerPointers.end(); i != e; ++i) { }
if (i.value()) {
i.key()->_private = 0; void ClipReadManager::clear() {
} QMutexLocker lock(&_readerPointersMutex);
} for (ReaderPointers::iterator i = _readerPointers.begin(), e = _readerPointers.end(); i != e; ++i) {
_readerPointers.clear(); if (i.value()) {
i.key()->_private = 0;
for (Readers::iterator i = _readers.begin(), e = _readers.end(); i != e; ++i) { }
delete i.key(); }
} _readerPointers.clear();
_readers.clear();
} for (Readers::iterator i = _readers.begin(), e = _readers.end(); i != e; ++i) {
delete i.key();
}
_readers.clear();
}
ClipReadManager::~ClipReadManager() {
clear();
} }

3
Telegram/SourceFiles/gui/animation.h
View File

@ -556,9 +556,12 @@ signals:
public slots: public slots:
void process(); void process();
void finish();
private: private:
void clear();
QAtomicInt _loadLevel; QAtomicInt _loadLevel;
typedef QMap<ClipReader*, ClipReaderPrivate*> ReaderPointers; typedef QMap<ClipReader*, ClipReaderPrivate*> ReaderPointers;
ReaderPointers _readerPointers; ReaderPointers _readerPointers;

4
Telegram/SourceFiles/history.cpp
View File

@ -4074,7 +4074,7 @@ void HistoryDocument::draw(Painter &p, const HistoryItem *parent, const QRect &r
} }
if (radial || (!loaded && !_data->loading())) { if (radial || (!loaded && !_data->loading())) {
float64 radialOpacity = (radial && loaded) ? _animation->radial.opacity() : 1; float64 radialOpacity = (radial && loaded && !_data->uploading()) ? _animation->radial.opacity() : 1;
QRect inner(rthumb.x() + (rthumb.width() - st::msgFileSize) / 2, rthumb.y() + (rthumb.height() - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize); QRect inner(rthumb.x() + (rthumb.width() - st::msgFileSize) / 2, rthumb.y() + (rthumb.height() - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
p.setPen(Qt::NoPen); p.setPen(Qt::NoPen);
if (selected) { if (selected) {
@ -4476,7 +4476,7 @@ void HistoryGif::draw(Painter &p, const HistoryItem *parent, const QRect &r, boo
} }
if (radial || (!_gif && !loaded && !_data->loading()) || (_gif == BadClipReader)) { if (radial || (!_gif && !loaded && !_data->loading()) || (_gif == BadClipReader)) {
float64 radialOpacity = radial ? _animation->radial.opacity() : 1; float64 radialOpacity = (radial && loaded && !_data->uploading()) ? _animation->radial.opacity() : 1;
QRect inner(rthumb.x() + (rthumb.width() - st::msgFileSize) / 2, rthumb.y() + (rthumb.height() - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize); QRect inner(rthumb.x() + (rthumb.width() - st::msgFileSize) / 2, rthumb.y() + (rthumb.height() - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
p.setPen(Qt::NoPen); p.setPen(Qt::NoPen);
if (selected) { if (selected) {

2
Telegram/SourceFiles/layout.cpp
View File

@ -855,7 +855,7 @@ void LayoutOverviewDocument::paint(Painter &p, const QRect &clip, uint32 selecti
if (radial || (!loaded && !_data->loading())) { if (radial || (!loaded && !_data->loading())) {
QRect inner(rthumb.x() + (rthumb.width() - st::msgFileSize) / 2, rthumb.y() + (rthumb.height() - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize); QRect inner(rthumb.x() + (rthumb.width() - st::msgFileSize) / 2, rthumb.y() + (rthumb.height() - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
if (clip.intersects(inner)) { if (clip.intersects(inner)) {
float64 radialOpacity = (radial && loaded) ? _radial->opacity() : 1; float64 radialOpacity = (radial && loaded && !_data->uploading()) ? _radial->opacity() : 1;
p.setPen(Qt::NoPen); p.setPen(Qt::NoPen);
if (selected) { if (selected) {
p.setBrush(st::msgDateImgBgSelected); p.setBrush(st::msgDateImgBgSelected);