mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 14:45:14 +00:00
Code Issues Releases Wiki Activity

Add edit/remove buttons to Single[File|Media]Preview.

Browse Source
This commit is contained in:
John Preston
2020-10-19 11:49:31 +03:00
parent 5589f51369
commit d7fe2948ac
9 changed files with 162 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Telegram/SourceFiles/boxes/boxes.style
View File

@@ -508,29 +508,33 @@ editMediaButton: IconButton {
// SendFilesBox
sendBoxAlbumGroupEditInternalSkip: 9px;
sendBoxAlbumGroupEditInternalSkip: 8px;
sendBoxAlbumGroupSkipRight: 6px;
sendBoxAlbumGroupSkipTop: 6px;
sendBoxAlbumGroupRadius: 12px;
sendBoxAlbumGroupHeight: 25px;
sendBoxAlbumGroupRadius: 13px;
sendBoxAlbumGroupHeight: 26px;
sendBoxFileGroupSkipTop: 2px;
sendBoxFileGroupSkipRight: 0px;
sendBoxFileGroupEditInternalSkip: 4px;
sendBoxAlbumGroupEditButtonIcon: editMediaButtonIconPhoto;
sendBoxAlbumGroupEditButtonIconPosition: point(4px, -1px);
sendBoxAlbumGroupButtonFile: IconButton(editMediaButton) {
ripple: RippleAnimation(defaultRippleAnimation) {
color: windowBgRipple;
}
}
sendBoxAlbumGroupDeleteButtonIconPosition: point(-3px, 0px);
sendBoxAlbumGroupDeleteButtonIcon: icon {{ "history_file_cancel", msgServiceFg}};
sendBoxAlbumGroupEditButtonIconFile: editMediaButtonIconFile;
sendBoxAlbumGroupDeleteButtonIconFile: icon {{ "history_file_cancel", menuIconFg, point(6px, 6px) }};
sendBoxAlbumGroupButtonMediaEdit: icon {{ "settings_edit", msgServiceFg, point(3px, -2px) }};
sendBoxAlbumGroupButtonMediaDelete: icon {{ "history_file_cancel", msgServiceFg, point(2px, 5px) }};
sendBoxAlbumGroupButtonMedia: IconButton {
width: sendBoxAlbumGroupHeight;
height: sendBoxAlbumGroupHeight;
icon: sendBoxAlbumGroupButtonMediaEdit;
}
// End of SendFilesBox
calendarTitleHeight: boxTitleHeight;

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

@@ -132,6 +132,7 @@ SendFilesBox::Block::Block(
gifPaused,
first);
if (media) {
_isSingleMedia = true;
_preview.reset(media);
} else {
_preview.reset(
@@ -154,19 +155,35 @@ object_ptr<Ui::RpWidget> SendFilesBox::Block::takeWidget() {
}
rpl::producer<int> SendFilesBox::Block::itemDeleteRequest() const {
if (!_isAlbum) {
return rpl::never<int>();
using namespace rpl::mappers;
const auto preview = _preview.get();
if (_isAlbum) {
const auto album = static_cast<Ui::AlbumPreview*>(_preview.get());
return album->thumbDeleted() | rpl::map(_1 + _from);
} else if (_isSingleMedia) {
const auto media = static_cast<Ui::SingleMediaPreview*>(preview);
return media->deleteRequests() | rpl::map([=] { return _from; });
} else {
const auto single = static_cast<Ui::SingleFilePreview*>(preview);
return single->deleteRequests() | rpl::map([=] { return _from; });
}
const auto album = static_cast<Ui::AlbumPreview*>(_preview.get());
return album->thumbDeleted();
}
rpl::producer<int> SendFilesBox::Block::itemReplaceRequest() const {
if (!_isAlbum) {
return rpl::never<int>();
using namespace rpl::mappers;
const auto preview = _preview.get();
if (_isAlbum) {
const auto album = static_cast<Ui::AlbumPreview*>(preview);
return album->thumbChanged() | rpl::map(_1 + _from);
} else if (_isSingleMedia) {
const auto media = static_cast<Ui::SingleMediaPreview*>(preview);
return media->editRequests() | rpl::map([=] { return _from; });
} else {
const auto single = static_cast<Ui::SingleFilePreview*>(preview);
return single->editRequests() | rpl::map([=] { return _from; });
}
const auto album = static_cast<Ui::AlbumPreview*>(_preview.get());
return album->thumbChanged();
}
void SendFilesBox::Block::setSendWay(Ui::SendFilesWay way) {
@@ -512,7 +529,7 @@ void SendFilesBox::pushBlock(int from, int till) {
) | rpl::filter([=] {
return !_removingIndex;
}) | rpl::start_with_next([=](int index) {
_removingIndex = from + index;
_removingIndex = index;
crl::on_main(this, [=] {
const auto index = base::take(_removingIndex).value_or(-1);
if (index < 0 || index >= _list.files.size()) {
@@ -529,19 +546,19 @@ void SendFilesBox::pushBlock(int from, int till) {
if (list.files.empty()) {
return;
}
_list.files[from + index] = std::move(list.files.front());
_list.files[index] = std::move(list.files.front());
refreshAllAfterChanges(from);
};
const auto checkResult = [=](const Ui::PreparedList &list) {
if (_sendLimit != SendLimit::One) {
return true;
}
auto removing = std::move(_list.files[from + index]);
std::swap(_list.files[from + index], _list.files.back());
auto removing = std::move(_list.files[index]);
std::swap(_list.files[index], _list.files.back());
_list.files.pop_back();
const auto result = _list.canBeSentInSlowmodeWith(list);
_list.files.push_back(std::move(removing));
std::swap(_list.files[from + index], _list.files.back());
std::swap(_list.files[index], _list.files.back());
if (!result) {
Ui::Toast::Show(tr::lng_slowmode_no_many(tr::now));
return false;

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

@@ -112,6 +112,7 @@ private:
int _from = 0;
int _till = 0;
bool _isAlbum = false;
bool _isSingleMedia = false;
};
void initSendWay();