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

Split some things into different methods in SendFilesBox.

This commit is contained in:
23rd 2020-01-04 00:48:36 +03:00 committed by John Preston
parent efa4deef6a
commit a26e4eee18
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Telegram/SourceFiles/boxes/send_files_box.cpp
View File

@ -979,6 +979,7 @@ private:
void updateSizeAnimated(const std::vector<Ui::GroupMediaLayout> &layout); void updateSizeAnimated(const std::vector<Ui::GroupMediaLayout> &layout);
void updateSize(); void updateSize();
int thumbIndexUnderCursor();
void deleteThumbUnderCursor(); void deleteThumbUnderCursor();
void paintAlbum(Painter &p) const; void paintAlbum(Painter &p) const;
@ -1285,25 +1286,33 @@ void SendFilesBox::AlbumPreview::paintFiles(Painter &p, QRect clip) const {
} }
} }
void SendFilesBox::AlbumPreview::deleteThumbUnderCursor() { int SendFilesBox::AlbumPreview::thumbIndexUnderCursor() {
const auto thumb = findThumb(mapFromGlobal(QCursor::pos())); const auto thumb = findThumb(mapFromGlobal(QCursor::pos()));
if (!thumb) { if (!thumb) {
return; return -1;
} }
const auto thumbIt = ranges::find_if(_thumbs, [&](auto &t) { const auto thumbIt = ranges::find_if(_thumbs, [&](auto &t) {
return t.get() == thumb; return t.get() == thumb;
}); });
const auto index = std::distance(_thumbs.begin(), thumbIt); Expects(thumbIt != _thumbs.end());
return std::distance(_thumbs.begin(), thumbIt);
}
void SendFilesBox::AlbumPreview::deleteThumbUnderCursor() {
auto index = thumbIndexUnderCursor();
if (index < 0) {
return;
}
const auto orderIt = ranges::find(_order, index); const auto orderIt = ranges::find(_order, index);
Expects(orderIt != _order.end()); Expects(orderIt != _order.end());
_order.erase(orderIt); _order.erase(orderIt);
for (auto i = orderIt; i != _order.end(); i++) { ranges::for_each(_order, [=](auto &i) {
if ((*i) > index) { if (i > index) {
(*i)--; i--;
} }
} });
_thumbDeleted.fire(index); _thumbDeleted.fire(std::move(index));
} }
void SendFilesBox::AlbumPreview::mousePressEvent(QMouseEvent *e) { void SendFilesBox::AlbumPreview::mousePressEvent(QMouseEvent *e) {
@ -1472,6 +1481,16 @@ void SendFilesBox::prepareAlbumPreview() {
_list, _list,
_sendWay->value())); _sendWay->value()));
addThumbButtonHandlers();
_preview = wrap;
_albumPreview->show();
setupShadows(wrap, _albumPreview);
initPreview(_albumPreview->desiredHeightValue());
}
void SendFilesBox::addThumbButtonHandlers() {
_albumPreview->thumbDeleted( _albumPreview->thumbDeleted(
) | rpl::start_with_next([=](auto index) { ) | rpl::start_with_next([=](auto index) {
@ -1497,11 +1516,6 @@ void SendFilesBox::prepareAlbumPreview() {
}, _albumPreview->lifetime()); }, _albumPreview->lifetime());
_preview = wrap;
_albumPreview->show();
setupShadows(wrap, _albumPreview);
initPreview(_albumPreview->desiredHeightValue());
} }
void SendFilesBox::setupShadows( void SendFilesBox::setupShadows(

2
Telegram/SourceFiles/boxes/send_files_box.h
View File

@ -120,6 +120,8 @@ private:
void updateControlsGeometry(); void updateControlsGeometry();
void updateCaptionPlaceholder(); void updateCaptionPlaceholder();
void addThumbButtonHandlers();
bool canAddFiles(not_null<const QMimeData*> data) const; bool canAddFiles(not_null<const QMimeData*> data) const;
bool canAddUrls(const QList<QUrl> &urls) const; bool canAddUrls(const QList<QUrl> &urls) const;
bool addFiles(not_null<const QMimeData*> data); bool addFiles(not_null<const QMimeData*> data);