RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change main menu cloud icon to saved messages.

This commit is contained in:
John Preston 2017-12-05 20:48:03 +04:00
parent 8b3d203861
commit 993877b0d4
4 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Telegram/SourceFiles/ui/empty_userpic.cpp
View File

@ -84,10 +84,23 @@ void EmptyUserpic::PaintSavedMessages(
int y,
int outerWidth,
int size) {
const auto &bg = st::historyPeer4UserpicBg;
const auto &fg = st::historyPeerUserpicFg;
PaintSavedMessages(p, x, y, outerWidth, size, bg, fg);
}
void EmptyUserpic::PaintSavedMessages(
Painter &p,
int x,
int y,
int outerWidth,
int size,
const style::color &bg,
const style::color &fg) {
x = rtl() ? (outerWidth - x - size) : x;
PainterHighQualityEnabler hq(p);
p.setBrush(st::historyPeer4UserpicBg);
p.setBrush(bg);
p.setPen(Qt::NoPen);
p.drawEllipse(x, y, size, size);
@ -118,7 +131,7 @@ void EmptyUserpic::PaintSavedMessages(
const auto half = (top + bottom) / 2;
p.setBrush(Qt::NoBrush);
auto pen = st::historyPeerUserpicFg->p;
auto pen = fg->p;
pen.setWidthF(thinkness);
pen.setCapStyle(Qt::FlatCap);

8
Telegram/SourceFiles/ui/empty_userpic.h
View File

@ -53,6 +53,14 @@ public:
int y,
int outerWidth,
int size);
static void PaintSavedMessages(
Painter &p,
int x,
int y,
int outerWidth,
int size,
const style::color &bg,
const style::color &fg);
~EmptyUserpic();

2
Telegram/SourceFiles/window/window.style
View File

@ -113,7 +113,7 @@ mainMenuCloudButton: IconButton {
height: 64px;
icon: icon {
{ "menu_cloud", mainMenuCloudFg },
// { "menu_cloud", mainMenuCloudFg },
};
iconPosition: point(22px, 22px);
}

23
Telegram/SourceFiles/window/window_main_menu.cpp
View File

@ -27,6 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "ui/widgets/labels.h"
#include "ui/widgets/menu.h"
#include "ui/special_buttons.h"
#include "ui/empty_userpic.h"
#include "mainwindow.h"
#include "storage/localstorage.h"
#include "boxes/about_box.h"
@ -199,13 +200,23 @@ void MainMenu::paintEvent(QPaintEvent *e) {
p.drawTextLeft(st::mainMenuCoverTextLeft, st::mainMenuCoverStatusTop, width(), _phoneText);
}
if (_cloudButton) {
PainterHighQualityEnabler hq(p);
p.setPen(Qt::NoPen);
p.setBrush(st::mainMenuCloudBg);
auto cloudBg = QRect(_cloudButton->x() + (_cloudButton->width() - st::mainMenuCloudSize) / 2,
Ui::EmptyUserpic::PaintSavedMessages(
p,
_cloudButton->x() + (_cloudButton->width() - st::mainMenuCloudSize) / 2,
_cloudButton->y() + (_cloudButton->height() - st::mainMenuCloudSize) / 2,
st::mainMenuCloudSize, st::mainMenuCloudSize);
p.drawEllipse(cloudBg);
width(),
st::mainMenuCloudSize,
st::mainMenuCloudBg,
st::mainMenuCloudFg);
//PainterHighQualityEnabler hq(p);
//p.setPen(Qt::NoPen);
//p.setBrush(st::mainMenuCloudBg);
//auto cloudBg = QRect(
// _cloudButton->x() + (_cloudButton->width() - st::mainMenuCloudSize) / 2,
// _cloudButton->y() + (_cloudButton->height() - st::mainMenuCloudSize) / 2,
// st::mainMenuCloudSize,
// st::mainMenuCloudSize);
//p.drawEllipse(cloudBg);
}
}
auto other = QRect(0, st::mainMenuCoverHeight, width(), height() - st::mainMenuCoverHeight).intersected(clip);