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

Returned animation type to the old one. 

Fixed new profile display in single column layout.
This commit is contained in:
John Preston 2016-05-19 15:38:09 +03:00
parent 1d42144c95
commit 92c720ddc3
6 changed files with 77 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/Resources/basic.style
View File

@ -379,7 +379,7 @@ slideDuration: 240;
slideShift: 100px; slideShift: 100px;
slideFadeOut: 0.3; slideFadeOut: 0.3;
slideShadow: sprite(348px, 71px, 48px, 1px); slideShadow: sprite(348px, 71px, 48px, 1px);
slideFunction: transition(linear); slideFunction: transition(easeOutCirc);
btnDefIconed: iconedButton { btnDefIconed: iconedButton {
color: white; color: white;

34
Telegram/SourceFiles/dialogswidget.cpp
View File

@ -1864,13 +1864,15 @@ void DialogsWidget::showAnimated(Window::SlideDirection direction, const Window:
_newGroup.hide(); _newGroup.hide();
int delta = st::slideShift; int delta = st::slideShift;
a_progress = anim::fvalue(0, 1);
if (direction == Window::SlideDirection::FromLeft) { if (direction == Window::SlideDirection::FromLeft) {
a_coordUnder = anim::ivalue(0, delta); a_progress = anim::fvalue(1, 0);
a_coordOver = anim::ivalue(-delta, 0); std::swap(_cacheUnder, _cacheOver);
a_coordUnder = anim::ivalue(-delta, 0);
a_coordOver = anim::ivalue(0, width());
} else { } else {
a_progress = anim::fvalue(0, 1);
a_coordUnder = anim::ivalue(0, -delta); a_coordUnder = anim::ivalue(0, -delta);
a_coordOver = anim::ivalue(delta, 0); a_coordOver = anim::ivalue(width(), 0);
} }
_a_show.start(); _a_show.start();
} }
@ -2539,23 +2541,15 @@ void DialogsWidget::paintEvent(QPaintEvent *e) {
} }
if (_a_show.animating()) { if (_a_show.animating()) {
int retina = cIntRetinaFactor(); int retina = cIntRetinaFactor();
if (a_progress.current() < 1) { if (a_coordOver.current() > 0) {
int underLeft = a_coordUnder.current(); p.drawPixmap(QRect(0, 0, a_coordOver.current(), _cacheUnder.height() / retina), _cacheUnder, QRect(-a_coordUnder.current() * retina, 0, a_coordOver.current() * retina, _cacheUnder.height()));
int underWidth = _cacheUnder.width() / retina; p.setOpacity(a_progress.current() * st::slideFadeOut);
int underHeight = _cacheUnder.height() / retina; p.fillRect(0, 0, a_coordOver.current(), _cacheUnder.height() / retina, st::black);
p.fillRect(r, st::white); p.setOpacity(1);
QRect underDst(0, 0, underWidth + underLeft, underHeight);
QRect underSrc(-underLeft * retina, 0, (underWidth + underLeft) * retina, underHeight * retina);
p.setOpacity(1. - a_progress.current());
p.drawPixmap(underDst, _cacheUnder, underSrc);
p.setOpacity(a_progress.current());
} }
int overLeft = a_coordOver.current(); p.drawPixmap(QRect(a_coordOver.current(), 0, _cacheOver.width() / retina, _cacheOver.height() / retina), _cacheOver, QRect(0, 0, _cacheOver.width(), _cacheOver.height()));
int overWidth = _cacheOver.width() / retina; p.setOpacity(a_progress.current());
int overHeight = _cacheOver.height() / retina; p.drawPixmap(QRect(a_coordOver.current() - st::slideShadow.pxWidth(), 0, st::slideShadow.pxWidth(), _cacheOver.height() / retina), App::sprite(), st::slideShadow.rect());
QRect overDst(overLeft, 0, overWidth - overLeft, overHeight);
QRect overSrc(0, 0, (overWidth - overLeft) * retina, overHeight * retina);
p.drawPixmap(overDst, _cacheOver, overSrc);
return; return;
} }
QRect above(0, 0, width(), _scroll.y()); QRect above(0, 0, width(), _scroll.y());

58
Telegram/SourceFiles/historywidget.cpp
View File

@ -5163,13 +5163,15 @@ void HistoryWidget::showAnimated(Window::SlideDirection direction, const Window:
} }
int delta = st::slideShift; int delta = st::slideShift;
a_progress = anim::fvalue(0, 1);
if (direction == Window::SlideDirection::FromLeft) { if (direction == Window::SlideDirection::FromLeft) {
a_coordUnder = anim::ivalue(0, delta); a_progress = anim::fvalue(1, 0);
a_coordOver = anim::ivalue(-delta, 0); std::swap(_cacheUnder, _cacheOver);
a_coordUnder = anim::ivalue(-delta, 0);
a_coordOver = anim::ivalue(0, width());
} else { } else {
a_progress = anim::fvalue(0, 1);
a_coordUnder = anim::ivalue(0, -delta); a_coordUnder = anim::ivalue(0, -delta);
a_coordOver = anim::ivalue(delta, 0); a_coordOver = anim::ivalue(width(), 0);
} }
_a_show.start(); _a_show.start();
@ -5912,23 +5914,15 @@ void HistoryWidget::onForwardHere() {
void HistoryWidget::paintTopBar(Painter &p, float64 over, int32 decreaseWidth) { void HistoryWidget::paintTopBar(Painter &p, float64 over, int32 decreaseWidth) {
if (_a_show.animating()) { if (_a_show.animating()) {
int retina = cIntRetinaFactor(); int retina = cIntRetinaFactor();
if (a_progress.current() < 1) { if (a_coordOver.current() > 0) {
int underLeft = a_coordUnder.current(); p.drawPixmap(QRect(0, 0, a_coordOver.current(), st::topBarHeight), _cacheUnder, QRect(-a_coordUnder.current() * retina, 0, a_coordOver.current() * retina, st::topBarHeight * retina));
int underWidth = _cacheUnder.width() / retina; p.setOpacity(a_progress.current() * st::slideFadeOut);
int underHeight = st::topBarHeight; p.fillRect(0, 0, a_coordOver.current(), st::topBarHeight, st::black);
p.fillRect(0, 0, underWidth, underHeight, st::white); p.setOpacity(1);
QRect underDst(0, 0, underWidth + underLeft, underHeight);
QRect underSrc(-underLeft * retina, 0, (underWidth + underLeft) * retina, underHeight * retina);
p.setOpacity(1. - a_progress.current());
p.drawPixmap(underDst, _cacheUnder, underSrc);
p.setOpacity(a_progress.current());
} }
int overLeft = a_coordOver.current(); p.drawPixmap(QRect(a_coordOver.current(), 0, _cacheOver.width() / retina, st::topBarHeight), _cacheOver, QRect(0, 0, _cacheOver.width(), st::topBarHeight * retina));
int overWidth = _cacheOver.width() / retina; p.setOpacity(a_progress.current());
int overHeight = st::topBarHeight; p.drawPixmap(QRect(a_coordOver.current() - st::slideShadow.pxWidth(), 0, st::slideShadow.pxWidth(), st::topBarHeight), App::sprite(), st::slideShadow.rect());
QRect overDst(overLeft, 0, overWidth - overLeft, overHeight);
QRect overSrc(0, 0, (overWidth - overLeft) * retina, overHeight * retina);
p.drawPixmap(overDst, _cacheOver, overSrc);
return; return;
} }
@ -8337,23 +8331,15 @@ void HistoryWidget::paintEvent(QPaintEvent *e) {
if (_a_show.animating()) { if (_a_show.animating()) {
int retina = cIntRetinaFactor(); int retina = cIntRetinaFactor();
int inCacheTop = hasTopBar ? st::topBarHeight : 0; int inCacheTop = hasTopBar ? st::topBarHeight : 0;
if (a_progress.current() < 1) { if (a_coordOver.current() > 0) {
int underLeft = a_coordUnder.current(); p.drawPixmap(QRect(0, 0, a_coordOver.current(), height()), _cacheUnder, QRect(-a_coordUnder.current() * retina, inCacheTop * retina, a_coordOver.current() * retina, height() * retina));
int underWidth = _cacheUnder.width() / retina; p.setOpacity(a_progress.current() * st::slideFadeOut);
int underHeight = height(); p.fillRect(0, 0, a_coordOver.current(), height(), st::black);
p.fillRect(r, st::white); p.setOpacity(1);
QRect underDst(0, 0, underWidth + underLeft, underHeight);
QRect underSrc(-underLeft * retina, inCacheTop * retina, (underWidth + underLeft) * retina, underHeight * retina);
p.setOpacity(1. - a_progress.current());
p.drawPixmap(underDst, _cacheUnder, underSrc);
p.setOpacity(a_progress.current());
} }
int overLeft = a_coordOver.current(); p.drawPixmap(QRect(a_coordOver.current(), 0, _cacheOver.width() / retina, height()), _cacheOver, QRect(0, inCacheTop * retina, _cacheOver.width(), height() * retina));
int overWidth = _cacheOver.width() / retina; p.setOpacity(a_progress.current());
int overHeight = height(); p.drawPixmap(QRect(a_coordOver.current() - st::slideShadow.pxWidth(), 0, st::slideShadow.pxWidth(), height()), App::sprite(), st::slideShadow.rect());
QRect overDst(overLeft, 0, overWidth - overLeft, overHeight);
QRect overSrc(0, inCacheTop * retina, (overWidth - overLeft) * retina, overHeight * retina);
p.drawPixmap(overDst, _cacheOver, overSrc);
return; return;
} }

1
Telegram/SourceFiles/mainwidget.cpp
View File

@ -2586,6 +2586,7 @@ void MainWidget::showAll() {
} }
if (_wideSection) { if (_wideSection) {
_topBar->hide(); _topBar->hide();
_dialogs->hide();
} else if (!selectingPeer() && (_overview || _history->peer())) { } else if (!selectingPeer() && (_overview || _history->peer())) {
_topBar->show(); _topBar->show();
_dialogs->hide(); _dialogs->hide();

58
Telegram/SourceFiles/overviewwidget.cpp
View File

@ -1989,23 +1989,15 @@ void OverviewWidget::paintEvent(QPaintEvent *e) {
if (_a_show.animating()) { if (_a_show.animating()) {
int retina = cIntRetinaFactor(); int retina = cIntRetinaFactor();
int inCacheTop = st::topBarHeight; int inCacheTop = st::topBarHeight;
if (a_progress.current() < 1) { if (a_coordOver.current() > 0) {
int underLeft = a_coordUnder.current(); p.drawPixmap(QRect(0, 0, a_coordOver.current(), height()), _cacheUnder, QRect(-a_coordUnder.current() * retina, inCacheTop * retina, a_coordOver.current() * retina, height() * retina));
int underWidth = _cacheUnder.width() / retina; p.setOpacity(a_progress.current() * st::slideFadeOut);
int underHeight = height(); p.fillRect(0, 0, a_coordOver.current(), height(), st::black);
p.fillRect(e->rect(), st::white); p.setOpacity(1);
QRect underDst(0, 0, underWidth + underLeft, underHeight);
QRect underSrc(-underLeft * retina, inCacheTop * retina, (underWidth + underLeft) * retina, underHeight * retina);
p.setOpacity(1. - a_progress.current());
p.drawPixmap(underDst, _cacheUnder, underSrc);
p.setOpacity(a_progress.current());
} }
int overLeft = a_coordOver.current(); p.drawPixmap(QRect(a_coordOver.current(), 0, _cacheOver.width() / retina, height()), _cacheOver, QRect(0, inCacheTop * retina, _cacheOver.width(), height() * retina));
int overWidth = _cacheOver.width() / retina; p.setOpacity(a_progress.current());
int overHeight = height(); p.drawPixmap(QRect(a_coordOver.current() - st::slideShadow.pxWidth(), 0, st::slideShadow.pxWidth(), height()), App::sprite(), st::slideShadow.rect());
QRect overDst(overLeft, 0, overWidth - overLeft, overHeight);
QRect overSrc(0, inCacheTop * retina, (overWidth - overLeft) * retina, overHeight * retina);
p.drawPixmap(overDst, _cacheOver, overSrc);
return; return;
} }
@ -2031,23 +2023,15 @@ void OverviewWidget::scrollReset() {
void OverviewWidget::paintTopBar(Painter &p, float64 over, int32 decreaseWidth) { void OverviewWidget::paintTopBar(Painter &p, float64 over, int32 decreaseWidth) {
if (_a_show.animating()) { if (_a_show.animating()) {
int retina = cIntRetinaFactor(); int retina = cIntRetinaFactor();
if (a_progress.current() < 1) { if (a_coordOver.current() > 0) {
int underLeft = a_coordUnder.current(); p.drawPixmap(QRect(0, 0, a_coordOver.current(), st::topBarHeight), _cacheUnder, QRect(-a_coordUnder.current() * retina, 0, a_coordOver.current() * retina, st::topBarHeight * retina));
int underWidth = _cacheUnder.width() / retina; p.setOpacity(a_progress.current() * st::slideFadeOut);
int underHeight = st::topBarHeight; p.fillRect(0, 0, a_coordOver.current(), st::topBarHeight, st::black);
p.fillRect(0, 0, underWidth, underHeight, st::white); p.setOpacity(1);
QRect underDst(0, 0, underWidth + underLeft, underHeight);
QRect underSrc(-underLeft * retina, 0, (underWidth + underLeft) * retina, underHeight * retina);
p.setOpacity(1. - a_progress.current());
p.drawPixmap(underDst, _cacheUnder, underSrc);
p.setOpacity(a_progress.current());
} }
int overLeft = a_coordOver.current(); p.drawPixmap(QRect(a_coordOver.current(), 0, _cacheOver.width() / retina, st::topBarHeight), _cacheOver, QRect(0, 0, _cacheOver.width(), st::topBarHeight * retina));
int overWidth = _cacheOver.width() / retina; p.setOpacity(a_progress.current());
int overHeight = st::topBarHeight; p.drawPixmap(QRect(a_coordOver.current() - st::slideShadow.pxWidth(), 0, st::slideShadow.pxWidth(), st::topBarHeight), App::sprite(), st::slideShadow.rect());
QRect overDst(overLeft, 0, overWidth - overLeft, overHeight);
QRect overSrc(0, 0, (overWidth - overLeft) * retina, overHeight * retina);
p.drawPixmap(overDst, _cacheOver, overSrc);
return; return;
} }
p.setOpacity(st::topBarBackAlpha + (1 - st::topBarBackAlpha) * over); p.setOpacity(st::topBarBackAlpha + (1 - st::topBarBackAlpha) * over);
@ -2172,13 +2156,15 @@ void OverviewWidget::showAnimated(Window::SlideDirection direction, const Window
_scroll.hide(); _scroll.hide();
int delta = st::slideShift; int delta = st::slideShift;
a_progress = anim::fvalue(0, 1);
if (direction == Window::SlideDirection::FromLeft) { if (direction == Window::SlideDirection::FromLeft) {
a_coordUnder = anim::ivalue(0, delta); a_progress = anim::fvalue(1, 0);
a_coordOver = anim::ivalue(-delta, 0); std::swap(_cacheUnder, _cacheOver);
a_coordUnder = anim::ivalue(-delta, 0);
a_coordOver = anim::ivalue(0, width());
} else { } else {
a_progress = anim::fvalue(0, 1);
a_coordUnder = anim::ivalue(0, -delta); a_coordUnder = anim::ivalue(0, -delta);
a_coordOver = anim::ivalue(delta, 0); a_coordOver = anim::ivalue(width(), 0);
} }
_a_show.start(); _a_show.start();

35
Telegram/SourceFiles/window/slide_animation.cpp
View File

@ -31,18 +31,15 @@ void SlideAnimation::paintContents(Painter &p, const QRect &update) const {
int retina = cIntRetinaFactor(); int retina = cIntRetinaFactor();
_animation.step(getms()); _animation.step(getms());
if (a_progress.current() < 1) { if (a_coordOver.current() > 0) {
p.fillRect(update, st::white); p.drawPixmap(QRect(0, 0, a_coordOver.current(), _cacheUnder.height() / retina), _cacheUnder, QRect(-a_coordUnder.current() * retina, 0, a_coordOver.current() * retina, _cacheUnder.height()));
int underLeft = a_coordUnder.current(); p.setOpacity(a_progress.current() * st::slideFadeOut);
int underWidth = _cacheUnder.width() / retina; p.fillRect(0, 0, a_coordOver.current(), _cacheUnder.height() / retina, st::black);
int underHeight = _cacheUnder.height() / retina; p.setOpacity(1);
QRect underDest(0, 0, underWidth + underLeft, underHeight);
QRect underSrc(-underLeft * retina, 0, (underWidth + underLeft) * retina, underHeight * retina);
p.setOpacity(1. - a_progress.current());
p.drawPixmap(underDest, _cacheUnder, underSrc);
p.setOpacity(a_progress.current());
} }
p.drawPixmap(a_coordOver.current(), 0, _cacheOver); p.drawPixmap(QRect(a_coordOver.current(), 0, _cacheOver.width() / retina, _cacheOver.height() / retina), _cacheOver, QRect(0, 0, _cacheOver.width(), _cacheOver.height()));
p.setOpacity(a_progress.current());
p.drawPixmap(QRect(a_coordOver.current() - st::slideShadow.pxWidth(), 0, st::slideShadow.pxWidth(), _cacheOver.height() / retina), App::sprite(), st::slideShadow.rect());
if (_topBarShadowEnabled) { if (_topBarShadowEnabled) {
p.setOpacity(1); p.setOpacity(1);
@ -73,13 +70,15 @@ void SlideAnimation::setFinishedCallback(FinishedCallback &&callback) {
void SlideAnimation::start() { void SlideAnimation::start() {
int delta = st::slideShift; int delta = st::slideShift;
a_progress = anim::fvalue(0, 1);
if (_direction == SlideDirection::FromLeft) { if (_direction == SlideDirection::FromLeft) {
a_coordUnder = anim::ivalue(0, delta); a_progress = anim::fvalue(1, 0);
a_coordOver = anim::ivalue(-delta, 0); std::swap(_cacheUnder, _cacheOver);
a_coordUnder = anim::ivalue(-delta, 0);
a_coordOver = anim::ivalue(0, _cacheOver.width() / cIntRetinaFactor());
} else { } else {
a_progress = anim::fvalue(0, 1);
a_coordUnder = anim::ivalue(0, -delta); a_coordUnder = anim::ivalue(0, -delta);
a_coordOver = anim::ivalue(delta, 0); a_coordOver = anim::ivalue(_cacheOver.width() / cIntRetinaFactor(), 0);
} }
_animation.start(); _animation.start();
} }
@ -98,9 +97,9 @@ void SlideAnimation::step(float64 ms, bool timer) {
} }
} }
a_coordUnder.update(dt, anim::linear); a_coordUnder.update(dt, st::slideFunction);
a_coordOver.update(dt, anim::linear); a_coordOver.update(dt, st::slideFunction);
a_progress.update(dt, anim::linear); a_progress.update(dt, st::slideFunction);
if (timer) { if (timer) {
_repaintCallback.call(); _repaintCallback.call();
} }