Show checks when sending file albums.
This commit is contained in:
parent
3dbc131b98
commit
12debce246
|
@ -99,7 +99,8 @@ float64 Document::dataProgress() const {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Document::dataFinished() const {
|
bool Document::dataFinished() const {
|
||||||
return !_data->loading() && !_data->uploading();
|
return !_data->loading()
|
||||||
|
&& (!_data->uploading() || _data->waitingForAlbum());
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Document::dataLoaded() const {
|
bool Document::dataLoaded() const {
|
||||||
|
@ -289,6 +290,7 @@ void Document::draw(
|
||||||
const auto rthumb = style::rtlrect(st.padding.left(), st.padding.top() - topMinus, st.thumbSize, st.thumbSize, width);
|
const auto rthumb = style::rtlrect(st.padding.left(), st.padding.top() - topMinus, st.thumbSize, st.thumbSize, width);
|
||||||
const auto innerSize = st::msgFileLayout.thumbSize;
|
const auto innerSize = st::msgFileLayout.thumbSize;
|
||||||
const auto inner = QRect(rthumb.x() + (rthumb.width() - innerSize) / 2, rthumb.y() + (rthumb.height() - innerSize) / 2, innerSize, innerSize);
|
const auto inner = QRect(rthumb.x() + (rthumb.width() - innerSize) / 2, rthumb.y() + (rthumb.height() - innerSize) / 2, innerSize, innerSize);
|
||||||
|
const auto radialOpacity = radial ? _animation->radial.opacity() : 1.;
|
||||||
if (thumbed) {
|
if (thumbed) {
|
||||||
auto inWebPage = (_parent->media() != this);
|
auto inWebPage = (_parent->media() != this);
|
||||||
auto roundRadius = inWebPage ? ImageRoundRadius::Small : ImageRoundRadius::Large;
|
auto roundRadius = inWebPage ? ImageRoundRadius::Small : ImageRoundRadius::Large;
|
||||||
|
@ -304,33 +306,43 @@ void Document::draw(
|
||||||
Ui::FillRoundRect(p, rthumb, p.textPalette().selectOverlay, overlayCorners);
|
Ui::FillRoundRect(p, rthumb, p.textPalette().selectOverlay, overlayCorners);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (radial || (!loaded && !_data->loading())) {
|
if (radial || (!loaded && !_data->loading()) || _data->waitingForAlbum()) {
|
||||||
float64 radialOpacity = (radial && loaded && !_data->uploading()) ? _animation->radial.opacity() : 1;
|
const auto backOpacity = (loaded && !_data->uploading()) ? radialOpacity : 1.;
|
||||||
p.setPen(Qt::NoPen);
|
p.setPen(Qt::NoPen);
|
||||||
if (selected) {
|
if (selected) {
|
||||||
p.setBrush(st::msgDateImgBgSelected);
|
p.setBrush(st::msgDateImgBgSelected);
|
||||||
} else {
|
} else {
|
||||||
p.setBrush(st::msgDateImgBg);
|
p.setBrush(st::msgDateImgBg);
|
||||||
}
|
}
|
||||||
p.setOpacity(radialOpacity * p.opacity());
|
p.setOpacity(backOpacity * p.opacity());
|
||||||
|
|
||||||
{
|
{
|
||||||
PainterHighQualityEnabler hq(p);
|
PainterHighQualityEnabler hq(p);
|
||||||
p.drawEllipse(inner);
|
p.drawEllipse(inner);
|
||||||
}
|
}
|
||||||
|
|
||||||
p.setOpacity(radialOpacity);
|
const auto icon = [&] {
|
||||||
auto icon = ([radial, this, selected] {
|
if (_data->waitingForAlbum()) {
|
||||||
if (radial || _data->loading()) {
|
return &(selected ? st::historyFileThumbWaitingSelected : st::historyFileThumbWaiting);
|
||||||
|
} else if (radial || _data->loading()) {
|
||||||
return &(selected ? st::historyFileThumbCancelSelected : st::historyFileThumbCancel);
|
return &(selected ? st::historyFileThumbCancelSelected : st::historyFileThumbCancel);
|
||||||
}
|
}
|
||||||
return &(selected ? st::historyFileThumbDownloadSelected : st::historyFileThumbDownload);
|
return &(selected ? st::historyFileThumbDownloadSelected : st::historyFileThumbDownload);
|
||||||
})();
|
}();
|
||||||
p.setOpacity((radial && loaded) ? _animation->radial.opacity() : 1);
|
const auto previous = [&]() -> const style::icon* {
|
||||||
icon->paintInCenter(p, inner);
|
if (_data->waitingForAlbum()) {
|
||||||
|
return &(selected ? st::historyFileThumbCancelSelected : st::historyFileThumbCancel);
|
||||||
|
}
|
||||||
|
return nullptr;
|
||||||
|
}();
|
||||||
|
p.setOpacity(backOpacity);
|
||||||
|
if (previous && radialOpacity > 0. && radialOpacity < 1.) {
|
||||||
|
PaintInterpolatedIcon(p, *icon, *previous, radialOpacity, inner);
|
||||||
|
} else {
|
||||||
|
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::historyFileThumbRadialFgSelected : st::historyFileThumbRadialFg);
|
_animation->radial.draw(p, rinner, st::msgFileRadialLine, selected ? st::historyFileThumbRadialFgSelected : st::historyFileThumbRadialFg);
|
||||||
}
|
}
|
||||||
|
@ -361,7 +373,9 @@ void Document::draw(
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto icon = [&] {
|
const auto icon = [&] {
|
||||||
if (!cornerDownload && (_data->loading() || _data->uploading())) {
|
if (_data->waitingForAlbum()) {
|
||||||
|
return &(outbg ? (selected ? st::historyFileOutWaitingSelected : st::historyFileOutWaiting) : (selected ? st::historyFileInWaitingSelected : st::historyFileInWaiting));
|
||||||
|
} else if (!cornerDownload && (_data->loading() || _data->uploading())) {
|
||||||
return &(outbg ? (selected ? st::historyFileOutCancelSelected : st::historyFileOutCancel) : (selected ? st::historyFileInCancelSelected : st::historyFileInCancel));
|
return &(outbg ? (selected ? st::historyFileOutCancelSelected : st::historyFileOutCancel) : (selected ? st::historyFileInCancelSelected : st::historyFileInCancel));
|
||||||
} else if (showPause) {
|
} else if (showPause) {
|
||||||
return &(outbg ? (selected ? st::historyFileOutPauseSelected : st::historyFileOutPause) : (selected ? st::historyFileInPauseSelected : st::historyFileInPause));
|
return &(outbg ? (selected ? st::historyFileOutPauseSelected : st::historyFileOutPause) : (selected ? st::historyFileInPauseSelected : st::historyFileInPause));
|
||||||
|
@ -375,7 +389,17 @@ void Document::draw(
|
||||||
}
|
}
|
||||||
return &(outbg ? (selected ? st::historyFileOutDownloadSelected : st::historyFileOutDownload) : (selected ? st::historyFileInDownloadSelected : st::historyFileInDownload));
|
return &(outbg ? (selected ? st::historyFileOutDownloadSelected : st::historyFileOutDownload) : (selected ? st::historyFileInDownloadSelected : st::historyFileInDownload));
|
||||||
}();
|
}();
|
||||||
icon->paintInCenter(p, inner);
|
const auto previous = [&]() -> const style::icon* {
|
||||||
|
if (_data->waitingForAlbum()) {
|
||||||
|
return &(outbg ? (selected ? st::historyFileOutCancelSelected : st::historyFileOutCancel) : (selected ? st::historyFileInCancelSelected : st::historyFileInCancel));
|
||||||
|
}
|
||||||
|
return nullptr;
|
||||||
|
}();
|
||||||
|
if (previous && radialOpacity > 0. && radialOpacity < 1.) {
|
||||||
|
PaintInterpolatedIcon(p, *icon, *previous, radialOpacity, inner);
|
||||||
|
} else {
|
||||||
|
icon->paintInCenter(p, inner);
|
||||||
|
}
|
||||||
|
|
||||||
if (radial && !cornerDownload) {
|
if (radial && !cornerDownload) {
|
||||||
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)));
|
||||||
|
|
|
@ -148,6 +148,10 @@ historyFileOutPlay: icon {{ "history_file_play", historyFileOutIconFg }};
|
||||||
historyFileOutPlaySelected: icon {{ "history_file_play", historyFileOutIconFgSelected }};
|
historyFileOutPlaySelected: icon {{ "history_file_play", historyFileOutIconFgSelected }};
|
||||||
historyFileInPlay: icon {{ "history_file_play", historyFileInIconFg }};
|
historyFileInPlay: icon {{ "history_file_play", historyFileInIconFg }};
|
||||||
historyFileInPlaySelected: icon {{ "history_file_play", historyFileInIconFgSelected }};
|
historyFileInPlaySelected: icon {{ "history_file_play", historyFileInIconFgSelected }};
|
||||||
|
historyFileOutWaiting: icon {{ "mediaview_save_check", historyFileOutIconFg }};
|
||||||
|
historyFileOutWaitingSelected: icon {{ "mediaview_save_check", historyFileOutIconFgSelected }};
|
||||||
|
historyFileInWaiting: icon {{ "mediaview_save_check", historyFileInIconFg }};
|
||||||
|
historyFileInWaitingSelected: icon {{ "mediaview_save_check", historyFileInIconFgSelected }};
|
||||||
|
|
||||||
historyFileThumbDownload: icon {{ "history_file_download", historyFileThumbIconFg }};
|
historyFileThumbDownload: icon {{ "history_file_download", historyFileThumbIconFg }};
|
||||||
historyFileThumbDownloadSelected: icon {{ "history_file_download", historyFileThumbIconFgSelected }};
|
historyFileThumbDownloadSelected: icon {{ "history_file_download", historyFileThumbIconFgSelected }};
|
||||||
|
|
Loading…
Reference in New Issue