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

Improve night mode theme. 

Also fix custom notification border painting with reply button.
This commit is contained in:
John Preston 2017-07-03 13:51:38 +03:00
parent d08dbb835f
commit ebb10fb8ed
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Telegram/Resources/icons/menu_night_mode.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 522 B

After

Width:  |  Height:  |  Size: 489 B

BIN
Telegram/Resources/icons/menu_night_mode@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 805 B

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
Telegram/Resources/night.tdesktop-theme
View File

Binary file not shown.

13
Telegram/SourceFiles/window/notifications_manager_default.cpp
View File

@ -542,16 +542,17 @@ void Notification::prepareActionsCache() {
auto replyCache = myGrab(_reply); auto replyCache = myGrab(_reply);
auto fadeWidth = st::notifyFadeRight.width(); auto fadeWidth = st::notifyFadeRight.width();
auto actionsTop = st::notifyTextTop + st::msgNameFont->height; auto actionsTop = st::notifyTextTop + st::msgNameFont->height;
auto actionsCacheWidth = _reply->width() + _replyPadding + fadeWidth; auto replyRight = _replyPadding - st::notifyBorderWidth;
auto actionsCacheHeight = height() - actionsTop; auto actionsCacheWidth = _reply->width() + replyRight + fadeWidth;
auto actionsCacheImg = QImage(actionsCacheWidth * cIntRetinaFactor(), actionsCacheHeight * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied); auto actionsCacheHeight = height() - actionsTop - st::notifyBorderWidth;
auto actionsCacheImg = QImage(QSize(actionsCacheWidth, actionsCacheHeight) * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
actionsCacheImg.setDevicePixelRatio(cRetinaFactor()); actionsCacheImg.setDevicePixelRatio(cRetinaFactor());
actionsCacheImg.fill(Qt::transparent); actionsCacheImg.fill(Qt::transparent);
{ {
Painter p(&actionsCacheImg); Painter p(&actionsCacheImg);
st::notifyFadeRight.fill(p, rtlrect(0, 0, fadeWidth, actionsCacheHeight, actionsCacheWidth)); st::notifyFadeRight.fill(p, rtlrect(0, 0, fadeWidth, actionsCacheHeight, actionsCacheWidth));
p.fillRect(rtlrect(fadeWidth, 0, actionsCacheWidth - fadeWidth, actionsCacheHeight, actionsCacheWidth), st::notificationBg); p.fillRect(rtlrect(fadeWidth, 0, actionsCacheWidth - fadeWidth, actionsCacheHeight, actionsCacheWidth), st::notificationBg);
p.drawPixmapRight(_replyPadding, _reply->y() - actionsTop, actionsCacheWidth, replyCache); p.drawPixmapRight(replyRight, _reply->y() - actionsTop, actionsCacheWidth, replyCache);
} }
_buttonsCache = App::pixmapFromImageInPlace(std::move(actionsCacheImg)); _buttonsCache = App::pixmapFromImageInPlace(std::move(actionsCacheImg));
} }
@ -609,9 +610,9 @@ void Notification::paintEvent(QPaintEvent *e) {
auto buttonsTop = st::notifyTextTop + st::msgNameFont->height; auto buttonsTop = st::notifyTextTop + st::msgNameFont->height;
if (a_actionsOpacity.animating(getms())) { if (a_actionsOpacity.animating(getms())) {
p.setOpacity(a_actionsOpacity.current()); p.setOpacity(a_actionsOpacity.current());
p.drawPixmapRight(0, buttonsTop, width(), _buttonsCache); p.drawPixmapRight(st::notifyBorderWidth, buttonsTop, width(), _buttonsCache);
} else if (_actionsVisible) { } else if (_actionsVisible) {
p.drawPixmapRight(0, buttonsTop, width(), _buttonsCache); p.drawPixmapRight(st::notifyBorderWidth, buttonsTop, width(), _buttonsCache);
} }
} }