mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 14:45:14 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into player

Browse Source 
Conflicts:
	Telegram/SourceFiles/core/observer.h
	Telegram/SourceFiles/mainwindow.h
	Telegram/SourceFiles/media/view/media_clip_playback.cpp
	Telegram/SourceFiles/media/view/media_clip_playback.h
This commit is contained in:
John Preston
2016-09-29 00:16:02 +03:00
parent 38114d3297 da49d8440a
commit 0562024444
114 changed files with 743 additions and 1196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/ui/widgets/media_slider.cpp
View File

@@ -158,7 +158,7 @@ void MediaSlider::setOver(bool over) {
_over = over;
auto from = _over ? 0. : 1., to = _over ? 1. : 0.;
START_ANIMATION(_a_over, func([this]() { update(); }), from, to, _st.duration, anim::linear);
_a_over.start([this] { update(); }, from, to, _st.duration);
}
} // namespace Ui