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

Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev

This commit is contained in:
John Preston 2015-10-19 01:02:06 +02:00
parent 12a2c5e80e 775607c24f
commit 5d14f3fe4a
9 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/dialogswidget.cpp
View File

@ -2201,7 +2201,7 @@ void DialogsWidget::paintEvent(QPaintEvent *e) {
} }
if (_a_show.animating()) { if (_a_show.animating()) {
if (a_coordOver.current() > 0) { if (a_coordOver.current() > 0) {
p.drawPixmap(QRect(0, 0, a_coordOver.current(), height()), _cacheUnder, QRect(-a_coordUnder.current(), 0, a_coordOver.current(), height())); p.drawPixmap(QRect(0, 0, a_coordOver.current(), height()), _cacheUnder, QRect(-a_coordUnder.current() * cRetinaFactor(), 0, a_coordOver.current() * cRetinaFactor(), height() * cRetinaFactor()));
p.setOpacity(a_shadow.current() * st::slideFadeOut); p.setOpacity(a_shadow.current() * st::slideFadeOut);
p.fillRect(0, 0, a_coordOver.current(), height(), st::black->b); p.fillRect(0, 0, a_coordOver.current(), height(), st::black->b);
p.setOpacity(1); p.setOpacity(1);

5
Telegram/SourceFiles/gui/twidget.cpp
View File

@ -47,9 +47,8 @@ QPixmap myGrab(TWidget *target, QRect rect) {
myEnsureResized(target); myEnsureResized(target);
if (rect.isNull()) rect = target->rect(); if (rect.isNull()) rect = target->rect();
qreal dpr = App::app()->devicePixelRatio(); QPixmap result(rect.size() * cRetinaFactor());
QPixmap result(rect.size() * dpr); result.setDevicePixelRatio(cRetinaFactor());
result.setDevicePixelRatio(dpr);
result.fill(Qt::transparent); result.fill(Qt::transparent);
target->grabStart(); target->grabStart();

2
Telegram/SourceFiles/historywidget.cpp
View File

@ -6315,7 +6315,7 @@ void HistoryWidget::paintEvent(QPaintEvent *e) {
} }
if (_a_show.animating()) { if (_a_show.animating()) {
if (a_coordOver.current() > 0) { if (a_coordOver.current() > 0) {
p.drawPixmap(QRect(0, 0, a_coordOver.current(), height()), _cacheUnder, QRect(-a_coordUnder.current(), 0, a_coordOver.current(), height())); p.drawPixmap(QRect(0, 0, a_coordOver.current(), height()), _cacheUnder, QRect(-a_coordUnder.current() * cRetinaFactor(), 0, a_coordOver.current() * cRetinaFactor(), height() * cRetinaFactor()));
p.setOpacity(a_shadow.current() * st::slideFadeOut); p.setOpacity(a_shadow.current() * st::slideFadeOut);
p.fillRect(0, 0, a_coordOver.current(), height(), st::black->b); p.fillRect(0, 0, a_coordOver.current(), height(), st::black->b);
p.setOpacity(1); p.setOpacity(1);

2
Telegram/SourceFiles/intro/intro.cpp
View File

@ -307,7 +307,7 @@ void IntroWidget::paintEvent(QPaintEvent *e) {
p.fillRect(e->rect(), st::white->b); p.fillRect(e->rect(), st::white->b);
if (_a_show.animating()) { if (_a_show.animating()) {
if (a_coordOver.current() > 0) { if (a_coordOver.current() > 0) {
p.drawPixmap(QRect(0, 0, a_coordOver.current(), height()), _cacheUnder, QRect(-a_coordUnder.current(), 0, a_coordOver.current(), height())); p.drawPixmap(QRect(0, 0, a_coordOver.current(), height()), _cacheUnder, QRect(-a_coordUnder.current() * cRetinaFactor(), 0, a_coordOver.current() * cRetinaFactor(), height() * cRetinaFactor()));
p.setOpacity(a_shadow.current() * st::slideFadeOut); p.setOpacity(a_shadow.current() * st::slideFadeOut);
p.fillRect(0, 0, a_coordOver.current(), height(), st::black->b); p.fillRect(0, 0, a_coordOver.current(), height(), st::black->b);
p.setOpacity(1); p.setOpacity(1);

4
Telegram/SourceFiles/mainwidget.cpp
View File

@ -382,8 +382,8 @@ MainWidget::MainWidget(Window *window) : TWidget(window)
, _started(0) , _started(0)
, failedObjId(0) , failedObjId(0)
, _toForwardNameVersion(0) , _toForwardNameVersion(0)
, _dialogsWidth(st::dlgMinWidth)
, _a_show(animFunc(this, &MainWidget::animStep_show)) , _a_show(animFunc(this, &MainWidget::animStep_show))
, _dialogsWidth(st::dlgMinWidth)
, dialogs(this) , dialogs(this)
, history(this) , history(this)
, profile(0) , profile(0)
@ -2813,7 +2813,7 @@ void MainWidget::paintEvent(QPaintEvent *e) {
Painter p(this); Painter p(this);
if (_a_show.animating()) { if (_a_show.animating()) {
if (a_coordOver.current() > 0) { if (a_coordOver.current() > 0) {
p.drawPixmap(QRect(0, 0, a_coordOver.current(), height()), _cacheUnder, QRect(-a_coordUnder.current(), 0, a_coordOver.current(), height())); p.drawPixmap(QRect(0, 0, a_coordOver.current(), height()), _cacheUnder, QRect(-a_coordUnder.current() * cRetinaFactor(), 0, a_coordOver.current() * cRetinaFactor(), height() * cRetinaFactor()));
p.setOpacity(a_shadow.current() * st::slideFadeOut); p.setOpacity(a_shadow.current() * st::slideFadeOut);
p.fillRect(0, 0, a_coordOver.current(), height(), st::black->b); p.fillRect(0, 0, a_coordOver.current(), height(), st::black->b);
p.setOpacity(1); p.setOpacity(1);

2
Telegram/SourceFiles/overviewwidget.cpp
View File

@ -2619,7 +2619,7 @@ void OverviewWidget::paintEvent(QPaintEvent *e) {
Painter p(this); Painter p(this);
if (_a_show.animating()) { if (_a_show.animating()) {
if (a_coordOver.current() > 0) { if (a_coordOver.current() > 0) {
p.drawPixmap(QRect(0, 0, a_coordOver.current(), height()), _cacheUnder, QRect(-a_coordUnder.current(), 0, a_coordOver.current(), height())); p.drawPixmap(QRect(0, 0, a_coordOver.current(), height()), _cacheUnder, QRect(-a_coordUnder.current() * cRetinaFactor(), 0, a_coordOver.current() * cRetinaFactor(), height() * cRetinaFactor()));
p.setOpacity(a_shadow.current() * st::slideFadeOut); p.setOpacity(a_shadow.current() * st::slideFadeOut);
p.fillRect(0, 0, a_coordOver.current(), height(), st::black->b); p.fillRect(0, 0, a_coordOver.current(), height(), st::black->b);
p.setOpacity(1); p.setOpacity(1);

2
Telegram/SourceFiles/passcodewidget.cpp
View File

@ -184,7 +184,7 @@ void PasscodeWidget::paintEvent(QPaintEvent *e) {
if (_a_show.animating()) { if (_a_show.animating()) {
if (a_coordOver.current() > 0) { if (a_coordOver.current() > 0) {
p.drawPixmap(QRect(0, 0, a_coordOver.current(), height()), _cacheUnder, QRect(-a_coordUnder.current(), 0, a_coordOver.current(), height())); p.drawPixmap(QRect(0, 0, a_coordOver.current(), height()), _cacheUnder, QRect(-a_coordUnder.current() * cRetinaFactor(), 0, a_coordOver.current() * cRetinaFactor(), height() * cRetinaFactor()));
p.setOpacity(a_shadow.current() * st::slideFadeOut); p.setOpacity(a_shadow.current() * st::slideFadeOut);
p.fillRect(0, 0, a_coordOver.current(), height(), st::black->b); p.fillRect(0, 0, a_coordOver.current(), height(), st::black->b);
p.setOpacity(1); p.setOpacity(1);

2
Telegram/SourceFiles/profilewidget.cpp
View File

@ -1577,7 +1577,7 @@ void ProfileWidget::paintEvent(QPaintEvent *e) {
Painter p(this); Painter p(this);
if (_a_show.animating()) { if (_a_show.animating()) {
if (a_coordOver.current() > 0) { if (a_coordOver.current() > 0) {
p.drawPixmap(QRect(0, 0, a_coordOver.current(), height()), _cacheUnder, QRect(-a_coordUnder.current(), 0, a_coordOver.current(), height())); p.drawPixmap(QRect(0, 0, a_coordOver.current(), height()), _cacheUnder, QRect(-a_coordUnder.current() * cRetinaFactor(), 0, a_coordOver.current() * cRetinaFactor(), height() * cRetinaFactor()));
p.setOpacity(a_shadow.current() * st::slideFadeOut); p.setOpacity(a_shadow.current() * st::slideFadeOut);
p.fillRect(0, 0, a_coordOver.current(), height(), st::black->b); p.fillRect(0, 0, a_coordOver.current(), height(), st::black->b);
p.setOpacity(1); p.setOpacity(1);

2
Telegram/SourceFiles/settingswidget.cpp
View File

@ -1829,7 +1829,7 @@ void SettingsWidget::paintEvent(QPaintEvent *e) {
} }
if (_a_show.animating()) { if (_a_show.animating()) {
if (a_coordOver.current() > 0) { if (a_coordOver.current() > 0) {
p.drawPixmap(QRect(0, 0, a_coordOver.current(), height()), _cacheUnder, QRect(-a_coordUnder.current(), 0, a_coordOver.current(), height())); p.drawPixmap(QRect(0, 0, a_coordOver.current(), height()), _cacheUnder, QRect(-a_coordUnder.current() * cRetinaFactor(), 0, a_coordOver.current() * cRetinaFactor(), height() * cRetinaFactor()));
p.setOpacity(a_shadow.current() * st::slideFadeOut); p.setOpacity(a_shadow.current() * st::slideFadeOut);
p.fillRect(0, 0, a_coordOver.current(), height(), st::black->b); p.fillRect(0, 0, a_coordOver.current(), height(), st::black->b);
p.setOpacity(1); p.setOpacity(1);