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

Improve sticker sending by drag-n-drop preview.

This commit is contained in:
John Preston 2019-04-03 14:16:45 +04:00
parent 74e120bc7b
commit f718410df3
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,7 @@ namespace {
constexpr auto kMinPreviewWidth = 20; constexpr auto kMinPreviewWidth = 20;
constexpr auto kShrinkDuration = crl::time(150); constexpr auto kShrinkDuration = crl::time(150);
constexpr auto kDragDuration = crl::time(200); constexpr auto kDragDuration = crl::time(200);
const auto kStickerMimeString = qstr("image/webp");
class SingleMediaPreview : public Ui::RpWidget { class SingleMediaPreview : public Ui::RpWidget {
public: public:
@ -53,6 +54,7 @@ public:
not_null<Window::Controller*> controller, not_null<Window::Controller*> controller,
QImage preview, QImage preview,
bool animated, bool animated,
bool sticker,
const QString &animatedPreviewPath); const QString &animatedPreviewPath);
bool canSendAsPhoto() const { bool canSendAsPhoto() const {
@ -73,6 +75,7 @@ private:
not_null<Window::Controller*> _controller; not_null<Window::Controller*> _controller;
bool _animated = false; bool _animated = false;
bool _sticker = false;
bool _canSendAsPhoto = false; bool _canSendAsPhoto = false;
QPixmap _preview; QPixmap _preview;
int _previewLeft = 0; int _previewLeft = 0;
@ -587,11 +590,13 @@ SingleMediaPreview *SingleMediaPreview::Create(
preview.height())) { preview.height())) {
return nullptr; return nullptr;
} }
const auto sticker = (file.information->filemime == kStickerMimeString);
return Ui::CreateChild<SingleMediaPreview>( return Ui::CreateChild<SingleMediaPreview>(
parent, parent,
controller, controller,
preview, preview,
animated, animated,
sticker,
animationPreview ? file.path : QString()); animationPreview ? file.path : QString());
} }
@ -600,15 +605,19 @@ SingleMediaPreview::SingleMediaPreview(
not_null<Window::Controller*> controller, not_null<Window::Controller*> controller,
QImage preview, QImage preview,
bool animated, bool animated,
bool sticker,
const QString &animatedPreviewPath) const QString &animatedPreviewPath)
: RpWidget(parent) : RpWidget(parent)
, _controller(controller) , _controller(controller)
, _animated(animated) { , _animated(animated)
, _sticker(sticker) {
Expects(!preview.isNull()); Expects(!preview.isNull());
_canSendAsPhoto = !_animated && Storage::ValidateThumbDimensions( _canSendAsPhoto = !_animated
preview.width(), && !_sticker
preview.height()); && Storage::ValidateThumbDimensions(
preview.width(),
preview.height());
preparePreview(preview, animatedPreviewPath); preparePreview(preview, animatedPreviewPath);
} }
@ -712,11 +721,13 @@ void SingleMediaPreview::clipCallback(Media::Clip::Notification notification) {
void SingleMediaPreview::paintEvent(QPaintEvent *e) { void SingleMediaPreview::paintEvent(QPaintEvent *e) {
Painter p(this); Painter p(this);
if (_previewLeft > st::boxPhotoPadding.left()) { if (!_sticker) {
p.fillRect(st::boxPhotoPadding.left(), st::boxPhotoPadding.top(), _previewLeft - st::boxPhotoPadding.left(), _previewHeight, st::confirmBg); if (_previewLeft > st::boxPhotoPadding.left()) {
} p.fillRect(st::boxPhotoPadding.left(), st::boxPhotoPadding.top(), _previewLeft - st::boxPhotoPadding.left(), _previewHeight, st::confirmBg);
if (_previewLeft + _previewWidth < width() - st::boxPhotoPadding.right()) { }
p.fillRect(_previewLeft + _previewWidth, st::boxPhotoPadding.top(), width() - st::boxPhotoPadding.right() - _previewLeft - _previewWidth, _previewHeight, st::confirmBg); if (_previewLeft + _previewWidth < width() - st::boxPhotoPadding.right()) {
p.fillRect(_previewLeft + _previewWidth, st::boxPhotoPadding.top(), width() - st::boxPhotoPadding.right() - _previewLeft - _previewWidth, _previewHeight, st::confirmBg);
}
} }
if (_gifPreview && _gifPreview->started()) { if (_gifPreview && _gifPreview->started()) {
auto s = QSize(_previewWidth, _previewHeight); auto s = QSize(_previewWidth, _previewHeight);