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

Some colors split for the palette. Theme preview applying improved. 

Also attempting to fix travis build.
This commit is contained in:
John Preston 2017-01-11 12:16:44 +04:00
parent 30c9bcb985
commit 2d185cf66e
13 changed files with 121 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis/build.sh
View File

@ -596,6 +596,7 @@ buildTelegram() {
-Dtravis_defines=${GYP_DEFINES:1} \ -Dtravis_defines=${GYP_DEFINES:1} \
-Dlinux_path_xkbcommon=$XKB_PATH \ -Dlinux_path_xkbcommon=$XKB_PATH \
-Dlinux_path_va=$VA_PATH \ -Dlinux_path_va=$VA_PATH \
-Dlinux_path_vdpau=$VDPAU_PATH \
-Dlinux_path_ffmpeg=$FFMPEG_PATH \ -Dlinux_path_ffmpeg=$FFMPEG_PATH \
-Dlinux_path_openal=$OPENAL_PATH \ -Dlinux_path_openal=$OPENAL_PATH \
-Dlinux_path_qt=$QT_PATH \ -Dlinux_path_qt=$QT_PATH \

26
Telegram/Resources/colors.palette
View File

@ -93,6 +93,7 @@ placeholderFg: windowSubTextFg;
placeholderFgActive: #aaaaaa; placeholderFgActive: #aaaaaa;
inputBorderFg: #e0e0e0; inputBorderFg: #e0e0e0;
filterInputBorderFg: #54c3f3; filterInputBorderFg: #54c3f3;
filterInputInactiveBg: windowBgOver;
checkboxFg: #b3b3b3; checkboxFg: #b3b3b3;
sliderBgInactive: #e1eaef; sliderBgInactive: #e1eaef;
@ -275,10 +276,10 @@ historyPeer8NameFg: #ce671b; // orange
historyPeer8UserpicBg: #faa774; historyPeer8UserpicBg: #faa774;
historyPeerUserpicFg: windowFgActive; historyPeerUserpicFg: windowFgActive;
historyScrollBarBg: #556e837a; historyScrollBarBg: #517c417a;
historyScrollBarBgOver: #556e83bc; historyScrollBarBgOver: #517c41bc;
historyScrollBg: #556e834c; historyScrollBg: #517c414c;
historyScrollBgOver: #556e836b; historyScrollBgOver: #517c416b;
msgInBg: windowBg; msgInBg: windowBg;
msgInBgSelected: #c2dcf2; // #358cd4 with 30% opacity msgInBgSelected: #c2dcf2; // #358cd4 with 30% opacity
@ -299,8 +300,8 @@ msgInDateFgSelected: #6a9cc5;
msgOutDateFg: #6cc264; msgOutDateFg: #6cc264;
msgOutDateFgSelected: #50a79c; msgOutDateFgSelected: #50a79c;
msgServiceFg: windowFgActive; msgServiceFg: windowFgActive;
msgServiceBg: #556e837f; msgServiceBg: #517c417f;
msgServiceBgSelected: #8ca0b3a2; msgServiceBgSelected: #96b38ba2;
msgInReplyBarColor: activeLineFg; msgInReplyBarColor: activeLineFg;
msgInReplyBarSelColor: activeLineFg; msgInReplyBarSelColor: activeLineFg;
msgOutReplyBarColor: historyOutIconFg; msgOutReplyBarColor: historyOutIconFg;
@ -341,6 +342,19 @@ msgFile4BgDark: #e6a561;
msgFile4BgOver: #dc9c5a; msgFile4BgOver: #dc9c5a;
msgFile4BgSelected: #b19d84; msgFile4BgSelected: #b19d84;
historyFileInIconFg: msgInBg;
historyFileInIconFgSelected: msgInBgSelected;
historyFileInRadialFg: historyFileInIconFg;
historyFileInRadialFgSelected: historyFileInIconFgSelected;
historyFileOutIconFg: msgOutBg;
historyFileOutIconFgSelected: msgOutBgSelected;
historyFileOutRadialFg: historyFileOutIconFg;
historyFileOutRadialFgSelected: historyFileOutIconFgSelected;
historyFileThumbIconFg: msgInBg;
historyFileThumbIconFgSelected: msgInBgSelected;
historyFileThumbRadialFg: historyFileThumbIconFg;
historyFileThumbRadialFgSelected: historyFileThumbIconFgSelected;
msgWaveformInActive: windowBgActive; msgWaveformInActive: windowBgActive;
msgWaveformInActiveSelected: #51a3d3; msgWaveformInActiveSelected: #51a3d3;
msgWaveformInInactive: #d4dee6; msgWaveformInInactive: #d4dee6;

25
Telegram/Resources/default.tdesktop-theme
View File

@ -82,6 +82,7 @@ placeholderFg: windowSubTextFg;
placeholderFgActive: #aaaaaa; placeholderFgActive: #aaaaaa;
inputBorderFg: #e0e0e0; inputBorderFg: #e0e0e0;
filterInputBorderFg: #54c3f3; filterInputBorderFg: #54c3f3;
filterInputInactiveBg: windowBgOver;
checkboxFg: #b3b3b3; checkboxFg: #b3b3b3;
sliderBgInactive: #e1eaef; sliderBgInactive: #e1eaef;
sliderBgActive: windowBgActive; sliderBgActive: windowBgActive;
@ -230,10 +231,10 @@ historyPeer7UserpicBg: #6ec9cb;
historyPeer8NameFg: #ce671b; historyPeer8NameFg: #ce671b;
historyPeer8UserpicBg: #faa774; historyPeer8UserpicBg: #faa774;
historyPeerUserpicFg: windowFgActive; historyPeerUserpicFg: windowFgActive;
historyScrollBarBg: #556e837a; historyScrollBarBg: #517c417a;
historyScrollBarBgOver: #556e83bc; historyScrollBarBgOver: #517c41bc;
historyScrollBg: #556e834c; historyScrollBg: #517c414c;
historyScrollBgOver: #556e836b; historyScrollBgOver: #517c416b;
msgInBg: windowBg; msgInBg: windowBg;
msgInBgSelected: #c2dcf2; msgInBgSelected: #c2dcf2;
msgOutBg: #effdde; msgOutBg: #effdde;
@ -253,8 +254,8 @@ msgInDateFgSelected: #6a9cc5;
msgOutDateFg: #6cc264; msgOutDateFg: #6cc264;
msgOutDateFgSelected: #50a79c; msgOutDateFgSelected: #50a79c;
msgServiceFg: windowFgActive; msgServiceFg: windowFgActive;
msgServiceBg: #556e837f; msgServiceBg: #517c417f;
msgServiceBgSelected: #8ca0b3a2; msgServiceBgSelected: #96b38ba2;
msgInReplyBarColor: activeLineFg; msgInReplyBarColor: activeLineFg;
msgInReplyBarSelColor: activeLineFg; msgInReplyBarSelColor: activeLineFg;
msgOutReplyBarColor: historyOutIconFg; msgOutReplyBarColor: historyOutIconFg;
@ -292,6 +293,18 @@ msgFile4Bg: #efc274;
msgFile4BgDark: #e6a561; msgFile4BgDark: #e6a561;
msgFile4BgOver: #dc9c5a; msgFile4BgOver: #dc9c5a;
msgFile4BgSelected: #b19d84; msgFile4BgSelected: #b19d84;
historyFileInIconFg: msgInBg;
historyFileInIconFgSelected: msgInBgSelected;
historyFileInRadialFg: historyFileInIconFg;
historyFileInRadialFgSelected: historyFileInIconFgSelected;
historyFileOutIconFg: msgOutBg;
historyFileOutIconFgSelected: msgOutBgSelected;
historyFileOutRadialFg: historyFileOutIconFg;
historyFileOutRadialFgSelected: historyFileOutIconFgSelected;
historyFileThumbIconFg: msgInBg;
historyFileThumbIconFgSelected: msgInBgSelected;
historyFileThumbRadialFg: historyFileThumbIconFg;
historyFileThumbRadialFgSelected: historyFileThumbIconFgSelected;
msgWaveformInActive: windowBgActive; msgWaveformInActive: windowBgActive;
msgWaveformInActiveSelected: #51a3d3; msgWaveformInActiveSelected: #51a3d3;
msgWaveformInInactive: #d4dee6; msgWaveformInInactive: #d4dee6;

55
Telegram/SourceFiles/history/history.style
View File

@ -102,30 +102,37 @@ membersInnerItem: ProfilePeerListItem {
statusFgActive: windowActiveTextFg; statusFgActive: windowActiveTextFg;
} }
historyFileOutImage: icon {{ "history_file_image", msgOutBg }}; historyFileOutImage: icon {{ "history_file_image", historyFileOutIconFg }};
historyFileOutImageSelected: icon {{ "history_file_image", msgOutBgSelected }}; historyFileOutImageSelected: icon {{ "history_file_image", historyFileOutIconFgSelected }};
historyFileInImage: icon {{ "history_file_image", msgInBg }}; historyFileInImage: icon {{ "history_file_image", historyFileInIconFg }};
historyFileInImageSelected: icon {{ "history_file_image", msgInBgSelected }}; historyFileInImageSelected: icon {{ "history_file_image", historyFileInIconFgSelected }};
historyFileOutDocument: icon {{ "history_file_document", msgOutBg }}; historyFileOutDocument: icon {{ "history_file_document", historyFileOutIconFg }};
historyFileOutDocumentSelected: icon {{ "history_file_document", msgOutBgSelected }}; historyFileOutDocumentSelected: icon {{ "history_file_document", historyFileOutIconFgSelected }};
historyFileInDocument: icon {{ "history_file_document", msgInBg }}; historyFileInDocument: icon {{ "history_file_document", historyFileInIconFg }};
historyFileInDocumentSelected: icon {{ "history_file_document", msgInBgSelected }}; historyFileInDocumentSelected: icon {{ "history_file_document", historyFileInIconFgSelected }};
historyFileOutDownload: icon {{ "history_file_download", msgOutBg }}; historyFileOutDownload: icon {{ "history_file_download", historyFileOutIconFg }};
historyFileOutDownloadSelected: icon {{ "history_file_download", msgOutBgSelected }}; historyFileOutDownloadSelected: icon {{ "history_file_download", historyFileOutIconFgSelected }};
historyFileInDownload: icon {{ "history_file_download", msgInBg }}; historyFileInDownload: icon {{ "history_file_download", historyFileInIconFg }};
historyFileInDownloadSelected: icon {{ "history_file_download", msgInBgSelected }}; historyFileInDownloadSelected: icon {{ "history_file_download", historyFileInIconFgSelected }};
historyFileOutCancel: icon {{ "history_file_cancel", msgOutBg }}; historyFileOutCancel: icon {{ "history_file_cancel", historyFileOutIconFg }};
historyFileOutCancelSelected: icon {{ "history_file_cancel", msgOutBgSelected }}; historyFileOutCancelSelected: icon {{ "history_file_cancel", historyFileOutIconFgSelected }};
historyFileInCancel: icon {{ "history_file_cancel", msgInBg }}; historyFileInCancel: icon {{ "history_file_cancel", historyFileInIconFg }};
historyFileInCancelSelected: icon {{ "history_file_cancel", msgInBgSelected }}; historyFileInCancelSelected: icon {{ "history_file_cancel", historyFileInIconFgSelected }};
historyFileOutPause: icon {{ "history_file_pause", msgOutBg }}; historyFileOutPause: icon {{ "history_file_pause", historyFileOutIconFg }};
historyFileOutPauseSelected: icon {{ "history_file_pause", msgOutBgSelected }}; historyFileOutPauseSelected: icon {{ "history_file_pause", historyFileOutIconFgSelected }};
historyFileInPause: icon {{ "history_file_pause", msgInBg }}; historyFileInPause: icon {{ "history_file_pause", historyFileInIconFg }};
historyFileInPauseSelected: icon {{ "history_file_pause", msgInBgSelected }}; historyFileInPauseSelected: icon {{ "history_file_pause", historyFileInIconFgSelected }};
historyFileOutPlay: icon {{ "history_file_play", msgOutBg }}; historyFileOutPlay: icon {{ "history_file_play", historyFileOutIconFg }};
historyFileOutPlaySelected: icon {{ "history_file_play", msgOutBgSelected }}; historyFileOutPlaySelected: icon {{ "history_file_play", historyFileOutIconFgSelected }};
historyFileInPlay: icon {{ "history_file_play", msgInBg }}; historyFileInPlay: icon {{ "history_file_play", historyFileInIconFg }};
historyFileInPlaySelected: icon {{ "history_file_play", msgInBgSelected }}; historyFileInPlaySelected: icon {{ "history_file_play", historyFileInIconFgSelected }};
historyFileThumbDownload: icon {{ "history_file_download", historyFileThumbIconFg }};
historyFileThumbDownloadSelected: icon {{ "history_file_download", historyFileThumbIconFgSelected }};
historyFileThumbCancel: icon {{ "history_file_cancel", historyFileThumbIconFg }};
historyFileThumbCancelSelected: icon {{ "history_file_cancel", historyFileThumbIconFgSelected }};
historyFileThumbPlay: icon {{ "history_file_play", historyFileThumbIconFg }};
historyFileThumbPlaySelected: icon {{ "history_file_play", historyFileThumbIconFgSelected }};
historySendStateSpace: 24px; historySendStateSpace: 24px;
historySendStatePosition: point(-17px, -19px); historySendStatePosition: point(-17px, -19px);

36
Telegram/SourceFiles/history/history_media_types.cpp
View File

@ -422,26 +422,24 @@ void HistoryPhoto::draw(Painter &p, const QRect &r, TextSelection selection, Tim
p.drawEllipse(inner); p.drawEllipse(inner);
} }
p.setOpacity(radial ? _animation->radial.opacity() : 1);
p.setOpacity(radialOpacity); p.setOpacity(radialOpacity);
auto icon = ([radial, this, selected]() -> const style::icon* { auto icon = ([radial, this, selected]() -> const style::icon* {
if (radial || _data->loading()) { if (radial || _data->loading()) {
auto delayed = _data->full->toDelayedStorageImage(); auto delayed = _data->full->toDelayedStorageImage();
if (!delayed || !delayed->location().isNull()) { if (!delayed || !delayed->location().isNull()) {
return &(selected ? st::historyFileInCancelSelected : st::historyFileInCancel); return &(selected ? st::historyFileThumbCancelSelected : st::historyFileThumbCancel);
} }
return nullptr; return nullptr;
} }
return &(selected ? st::historyFileInDownloadSelected : st::historyFileInDownload); return &(selected ? st::historyFileThumbDownloadSelected : st::historyFileThumbDownload);
})(); })();
if (icon) { if (icon) {
icon->paintInCenter(p, inner); icon->paintInCenter(p, inner);
} }
p.setOpacity(1);
if (radial) { if (radial) {
p.setOpacity(1);
QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine))); QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
_animation->radial.draw(p, rinner, st::msgFileRadialLine, selected ? st::msgInBgSelected : st::msgInBg); _animation->radial.draw(p, rinner, st::msgFileRadialLine, selected ? st::historyFileThumbRadialFgSelected : st::historyFileThumbRadialFg);
} }
} }
@ -766,16 +764,16 @@ void HistoryVideo::draw(Painter &p, const QRect &r, TextSelection selection, Tim
auto icon = ([loaded, radial, this, selected] { auto icon = ([loaded, radial, this, selected] {
if (loaded) { if (loaded) {
return &(selected ? st::historyFileInPlaySelected : st::historyFileInPlay); return &(selected ? st::historyFileThumbPlaySelected : st::historyFileThumbPlay);
} else if (radial || _data->loading()) { } else if (radial || _data->loading()) {
return &(selected ? st::historyFileInCancelSelected : st::historyFileInCancel); return &(selected ? st::historyFileThumbCancelSelected : st::historyFileThumbCancel);
} }
return &(selected ? st::historyFileInDownloadSelected : st::historyFileInDownload); return &(selected ? st::historyFileThumbDownloadSelected : st::historyFileThumbDownload);
})(); })();
icon->paintInCenter(p, inner); icon->paintInCenter(p, inner);
if (radial) { if (radial) {
QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine))); QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
_animation->radial.draw(p, rinner, st::msgFileRadialLine, selected ? st::msgInBgSelected : st::msgInBg); _animation->radial.draw(p, rinner, st::msgFileRadialLine, selected ? st::historyFileThumbRadialFgSelected : st::historyFileThumbRadialFg);
} }
int32 statusX = skipx + st::msgDateImgDelta + st::msgDateImgPadding.x(), statusY = skipy + st::msgDateImgDelta + st::msgDateImgPadding.y(); int32 statusX = skipx + st::msgDateImgDelta + st::msgDateImgPadding.x(), statusY = skipy + st::msgDateImgDelta + st::msgDateImgPadding.y();
@ -1135,9 +1133,9 @@ void HistoryDocument::draw(Painter &p, const QRect &r, TextSelection selection,
p.setOpacity(radialOpacity); p.setOpacity(radialOpacity);
auto icon = ([radial, this, selected] { auto icon = ([radial, this, selected] {
if (radial || _data->loading()) { if (radial || _data->loading()) {
return &(selected ? st::historyFileInCancelSelected : st::historyFileInCancel); return &(selected ? st::historyFileThumbCancelSelected : st::historyFileThumbCancel);
} }
return &(selected ? st::historyFileInDownloadSelected : st::historyFileInDownload); return &(selected ? st::historyFileThumbDownloadSelected : st::historyFileThumbDownload);
})(); })();
p.setOpacity((radial && loaded) ? _animation->radial.opacity() : 1); p.setOpacity((radial && loaded) ? _animation->radial.opacity() : 1);
icon->paintInCenter(p, inner); icon->paintInCenter(p, inner);
@ -1145,7 +1143,7 @@ void HistoryDocument::draw(Painter &p, const QRect &r, TextSelection selection,
p.setOpacity(1); p.setOpacity(1);
QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine))); QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
_animation->radial.draw(p, rinner, st::msgFileRadialLine, selected ? st::msgInBgSelected : st::msgInBg); _animation->radial.draw(p, rinner, st::msgFileRadialLine, selected ? st::historyFileThumbRadialFgSelected : st::historyFileThumbRadialFg);
} }
} }
@ -1182,8 +1180,8 @@ void HistoryDocument::draw(Painter &p, const QRect &r, TextSelection selection,
if (radial) { if (radial) {
QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine))); QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
auto &bg = outbg ? (selected ? st::msgOutBgSelected : st::msgOutBg) : (selected ? st::msgInBgSelected : st::msgInBg); auto fg = outbg ? (selected ? st::historyFileOutRadialFgSelected : st::historyFileOutRadialFg) : (selected ? st::historyFileInRadialFgSelected : st::historyFileInRadialFg);
_animation->radial.draw(p, rinner, st::msgFileRadialLine, bg); _animation->radial.draw(p, rinner, st::msgFileRadialLine, fg);
} }
auto icon = ([showPause, radial, this, loaded, outbg, selected] { auto icon = ([showPause, radial, this, loaded, outbg, selected] {
@ -1769,14 +1767,14 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
p.setOpacity(radialOpacity); p.setOpacity(radialOpacity);
auto icon = ([this, radial, selected]() -> const style::icon * { auto icon = ([this, radial, selected]() -> const style::icon * {
if (_data->loaded() && !radial) { if (_data->loaded() && !radial) {
return &(selected ? st::historyFileInPlaySelected : st::historyFileInPlay); return &(selected ? st::historyFileThumbPlaySelected : st::historyFileThumbPlay);
} else if (radial || _data->loading()) { } else if (radial || _data->loading()) {
if (_parent->id > 0 || _data->uploading()) { if (_parent->id > 0 || _data->uploading()) {
return &(selected ? st::historyFileInCancelSelected : st::historyFileInCancel); return &(selected ? st::historyFileThumbCancelSelected : st::historyFileThumbCancel);
} }
return nullptr; return nullptr;
} }
return &(selected ? st::historyFileInDownloadSelected : st::historyFileInDownload); return &(selected ? st::historyFileThumbDownloadSelected : st::historyFileThumbDownload);
})(); })();
if (icon) { if (icon) {
icon->paintInCenter(p, inner); icon->paintInCenter(p, inner);
@ -1784,7 +1782,7 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
if (radial) { if (radial) {
p.setOpacity(1); p.setOpacity(1);
QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine))); QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
_animation->radial.draw(p, rinner, st::msgFileRadialLine, selected ? st::msgInBgSelected : st::msgInBg); _animation->radial.draw(p, rinner, st::msgFileRadialLine, selected ? st::historyFileThumbRadialFgSelected : st::historyFileThumbRadialFg);
} }
if (!animating || _parent->id < 0) { if (!animating || _parent->id < 0) {

14
Telegram/SourceFiles/overview/overview_layout.cpp
View File

@ -399,17 +399,17 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
p.setOpacity((radial && loaded) ? _radial->opacity() : 1); p.setOpacity((radial && loaded) ? _radial->opacity() : 1);
auto icon = ([radial, loaded, selected] { auto icon = ([radial, loaded, selected] {
if (radial) { if (radial) {
return &(selected ? st::historyFileInCancelSelected : st::historyFileInCancel); return &(selected ? st::historyFileThumbCancelSelected : st::historyFileThumbCancel);
} else if (loaded) { } else if (loaded) {
return &(selected ? st::historyFileInPlaySelected : st::historyFileInPlay); return &(selected ? st::historyFileThumbPlaySelected : st::historyFileThumbPlay);
} }
return &(selected ? st::historyFileInDownloadSelected : st::historyFileInDownload); return &(selected ? st::historyFileThumbDownloadSelected : st::historyFileThumbDownload);
})(); })();
icon->paintInCenter(p, inner); icon->paintInCenter(p, inner);
if (radial) { if (radial) {
p.setOpacity(1); p.setOpacity(1);
QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine))); QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
_radial->draw(p, rinner, st::msgFileRadialLine, selected ? st::msgInBgSelected : st::msgInBg); _radial->draw(p, rinner, st::msgFileRadialLine, selected ? st::historyFileThumbRadialFgSelected : st::historyFileThumbRadialFg);
} }
} }
@ -830,16 +830,16 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
p.setOpacity(radialOpacity); p.setOpacity(radialOpacity);
auto icon = ([loaded, this, selected] { auto icon = ([loaded, this, selected] {
if (loaded || _data->loading()) { if (loaded || _data->loading()) {
return &(selected ? st::historyFileInCancelSelected : st::historyFileInCancel); return &(selected ? st::historyFileThumbCancelSelected : st::historyFileThumbCancel);
} }
return &(selected ? st::historyFileInDownloadSelected : st::historyFileInDownload); return &(selected ? st::historyFileThumbDownloadSelected : st::historyFileThumbDownload);
})(); })();
icon->paintInCenter(p, inner); icon->paintInCenter(p, inner);
if (radial) { if (radial) {
p.setOpacity(1); p.setOpacity(1);
QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine))); QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
_radial->draw(p, rinner, st::msgFileRadialLine, selected ? st::msgInBgSelected : st::msgInBg); _radial->draw(p, rinner, st::msgFileRadialLine, selected ? st::historyFileThumbRadialFgSelected : st::historyFileThumbRadialFg);
} }
} }
} }

2
Telegram/SourceFiles/settings/settings_background_widget.cpp
View File

@ -80,7 +80,7 @@ void BackgroundRow::paintEvent(QPaintEvent *e) {
p.drawPixmap(0, 0, _background); p.drawPixmap(0, 0, _background);
} else { } else {
const QPixmap &pix = App::main()->newBackgroundThumb()->pixBlurred(st::settingsBackgroundSize); const QPixmap &pix = App::main()->newBackgroundThumb()->pixBlurred(st::settingsBackgroundSize);
p.drawPixmap(0, 0, st::settingsBackgroundSize, st::settingsBackgroundSize, pix, 0, (pix.height() - st::settingsBackgroundSize) / 2, st::settingsBackgroundSize, st::settingsBackgroundSize); p.drawPixmap(0, 0, st::settingsBackgroundSize, st::settingsBackgroundSize, pix, 0, (pix.height() - st::settingsBackgroundSize * cIntRetinaFactor()) / 2, st::settingsBackgroundSize * cIntRetinaFactor(), st::settingsBackgroundSize * cIntRetinaFactor());
} }
auto outer = radialRect(); auto outer = radialRect();

2
Telegram/SourceFiles/ui/animation.h
View File

@ -97,7 +97,7 @@ extern transition easeOutBack;
extern transition easeInCirc; extern transition easeInCirc;
extern transition easeOutCirc; extern transition easeOutCirc;
extern transition easeInCubic; extern transition easeInCubic;
extern transition easeOutCirc; extern transition easeOutCubic;
extern transition easeInQuint; extern transition easeInQuint;
extern transition easeOutQuint; extern transition easeOutQuint;

2
Telegram/SourceFiles/ui/effects/ripple_animation.cpp
View File

@ -72,7 +72,7 @@ RippleAnimation::Ripple::Ripple(const style::RippleAnimation &st, QPoint origin,
} }
_radiusTo = qRound(sqrt(_radiusTo)); _radiusTo = qRound(sqrt(_radiusTo));
_show.start(UpdateCallback(_update), 0., 1., _st.showDuration, anim::easeOutCirc); _show.start(UpdateCallback(_update), 0., 1., _st.showDuration, anim::easeOutQuint);
} }
RippleAnimation::Ripple::Ripple(const style::RippleAnimation &st, const QPixmap &mask, const UpdateCallback &update) RippleAnimation::Ripple::Ripple(const style::RippleAnimation &st, const QPixmap &mask, const UpdateCallback &update)

6
Telegram/SourceFiles/ui/widgets/widgets.style
View File

@ -461,7 +461,7 @@ defaultLinkButton: LinkButton {
defaultRippleAnimation: RippleAnimation { defaultRippleAnimation: RippleAnimation {
color: windowBgRipple; color: windowBgRipple;
showDuration: 450; showDuration: 650;
hideDuration: 200; hideDuration: 200;
} }
@ -542,7 +542,7 @@ defaultSolidScroll: ScrollArea(defaultScrollArea) {
defaultInputFont: font(17px); defaultInputFont: font(17px);
defaultFlatInput: FlatInput { defaultFlatInput: FlatInput {
textColor: windowFg; textColor: windowFg;
bgColor: windowBgOver; bgColor: filterInputInactiveBg;
bgActive: windowBg; bgActive: windowBg;
width: 210px; width: 210px;
height: 40px; height: 40px;
@ -551,7 +551,7 @@ defaultFlatInput: FlatInput {
font: defaultInputFont; font: defaultInputFont;
borderWidth: 2px; borderWidth: 2px;
borderColor: windowBgOver; borderColor: filterInputInactiveBg;
borderActive: filterInputBorderFg; borderActive: filterInputBorderFg;
phColor: placeholderFg; phColor: placeholderFg;

19
Telegram/SourceFiles/window/window_theme.cpp
View File

@ -421,7 +421,13 @@ void ChatBackground::setPreparedImage(QImage &&image) {
image = std_::move(image).convertToFormat(QImage::Format_ARGB32_Premultiplied); image = std_::move(image).convertToFormat(QImage::Format_ARGB32_Premultiplied);
image.setDevicePixelRatio(cRetinaFactor()); image.setDevicePixelRatio(cRetinaFactor());
if (_id != kThemeBackground && _id != internal::kTestingThemeBackground) { if (_id != kThemeBackground && _id != internal::kTestingThemeBackground) {
initColorsFromBackground(image); auto colorsFromSomeTheme = Local::hasTheme();
if (instance && !instance->applying.paletteForRevert.isEmpty()) {
colorsFromSomeTheme = !instance->applying.path.isEmpty();
}
if (colorsFromSomeTheme || (_id != kDefaultBackground && _id != internal::kTestingDefaultBackground)) {
initColorsFromBackground(image);
}
} }
auto width = image.width(); auto width = image.width();
@ -520,16 +526,22 @@ void ChatBackground::setTestingTheme(Instance &&theme) {
saveForRevert(); saveForRevert();
setImage(internal::kTestingThemeBackground, std_::move(theme.background)); setImage(internal::kTestingThemeBackground, std_::move(theme.background));
setTile(theme.tiled); setTile(theme.tiled);
} else {
// Apply current background image so that service bg colors are recounted.
setImage(_id, std_::move(_pixmap).toImage());
} }
notify(BackgroundUpdate(BackgroundUpdate::Type::TestingTheme, _tile), true); notify(BackgroundUpdate(BackgroundUpdate::Type::TestingTheme, _tile), true);
} }
void ChatBackground::setTestingDefaultTheme() { void ChatBackground::setTestingDefaultTheme() {
style::main_palette::reset(); style::main_palette::reset();
if (_id != kDefaultBackground) { if (_id == kThemeBackground) {
saveForRevert(); saveForRevert();
setImage(internal::kTestingDefaultBackground); setImage(internal::kTestingDefaultBackground);
setTile(false); setTile(false);
} else {
// Apply current background image so that service bg colors are recounted.
setImage(_id, std_::move(_pixmap).toImage());
} }
notify(BackgroundUpdate(BackgroundUpdate::Type::TestingTheme, _tile), true); notify(BackgroundUpdate(BackgroundUpdate::Type::TestingTheme, _tile), true);
} }
@ -560,6 +572,9 @@ void ChatBackground::revert() {
if (_id == internal::kTestingThemeBackground || _id == internal::kTestingDefaultBackground) { if (_id == internal::kTestingThemeBackground || _id == internal::kTestingDefaultBackground) {
setTile(_tileForRevert); setTile(_tileForRevert);
setImage(_idForRevert, std_::move(_imageForRevert)); setImage(_idForRevert, std_::move(_imageForRevert));
} else {
// Apply current background image so that service bg colors are recounted.
setImage(_id, std_::move(_pixmap).toImage());
} }
notify(BackgroundUpdate(BackgroundUpdate::Type::RevertingTheme, _tile), true); notify(BackgroundUpdate(BackgroundUpdate::Type::RevertingTheme, _tile), true);
} }

1
Telegram/SourceFiles/window/window_theme_preview.cpp
View File

@ -829,6 +829,7 @@ void Generator::paintService(QString text) {
auto bubbleLeft = _history.x() + (_history.width() - bubbleWidth) / 2; auto bubbleLeft = _history.x() + (_history.width() - bubbleWidth) / 2;
_p->drawRoundedRect(bubbleLeft, bubbleTop, bubbleWidth, bubbleHeight, radius, radius); _p->drawRoundedRect(bubbleLeft, bubbleTop, bubbleWidth, bubbleHeight, radius, radius);
_p->setPen(st::msgServiceFg[_palette]); _p->setPen(st::msgServiceFg[_palette]);
_p->setFont(st::msgServiceFont);
_p->drawText(bubbleLeft + st::msgServicePadding.left(), bubbleTop + st::msgServicePadding.top() + st::msgServiceFont->ascent, text); _p->drawText(bubbleLeft + st::msgServicePadding.left(), bubbleTop + st::msgServicePadding.top() + st::msgServiceFont->ascent, text);
_historyBottom = bubbleTop - st::msgServiceMargin.top(); _historyBottom = bubbleTop - st::msgServiceMargin.top();
} }

2
Telegram/gyp/telegram_linux.gypi
View File

@ -31,6 +31,7 @@
'linux_path_openal%': '/usr/local', 'linux_path_openal%': '/usr/local',
'linux_path_libexif_lib%': '<(libs_loc)/libexif-0.6.20/libexif/.libs', 'linux_path_libexif_lib%': '<(libs_loc)/libexif-0.6.20/libexif/.libs',
'linux_path_va%': '/usr/local', 'linux_path_va%': '/usr/local',
'linux_path_vdpau%': '/usr/local',
'linux_path_breakpad%': '<(libs_loc)/breakpad', 'linux_path_breakpad%': '<(libs_loc)/breakpad',
}, },
'include_dirs': [ 'include_dirs': [
@ -45,6 +46,7 @@
'<(linux_path_openal)/lib', '<(linux_path_openal)/lib',
'<(linux_path_libexif_lib)', '<(linux_path_libexif_lib)',
'<(linux_path_va)/lib', '<(linux_path_va)/lib',
'<(linux_path_vdpau)/lib',
'<(linux_path_breakpad)/lib', '<(linux_path_breakpad)/lib',
], ],
'libraries': [ 'libraries': [