Removed IconButtons from album items in SendFilesBox.

Telegram/SourceFiles/boxes/boxes.style

@@ -521,13 +521,12 @@ sendBoxAlbumGroupSkipRight: 6px;
 sendBoxAlbumGroupSkipTop: 6px;
 sendBoxAlbumGroupRadius: 12px;
 sendBoxAlbumGroupHeight: 25px;
-sendBoxAlbumGroupClickArea: 34px;
 
 sendBoxAlbumGroupEditButtonIcon: icon {{ "settings_edit", msgServiceFg }};
 sendBoxAlbumGroupEditButtonIconPosition: point(4px, -1px);
 sendBoxAlbumGroupButton: IconButton {
-	width: sendBoxAlbumGroupClickArea;
+	width: sendBoxAlbumGroupHeight;
-	height: sendBoxAlbumGroupClickArea;
+	height: sendBoxAlbumGroupHeight;
 }
 
 sendBoxAlbumGroupDeleteButtonIcon: icon {{ "history_file_cancel", msgServiceFg}};

Telegram/SourceFiles/boxes/send_files_box.cpp

@@ -50,6 +50,12 @@ constexpr auto kMinPreviewWidth = 20;
 constexpr auto kShrinkDuration = crl::time(150);
 constexpr auto kDragDuration = crl::time(200);
 
+enum class ButtonType {
+	Edit,
+	Delete,
+	None,
+};
+
 inline bool CanAddUrls(const QList<QUrl> &urls) {
 	return !urls.isEmpty() && ranges::find_if(
 		urls,
@@ -67,29 +73,21 @@ inline bool IsSingleItem(const Storage::PreparedList &list) {
 	return list.files.size() == 1;
 }
 
-void PaintAlbumThumbButtons(
+QRect PaintAlbumThumbButtons(
 	Painter &p,
 	QPoint point,
 	int outerWidth,
-	float64 shrinkProgress,
+	float64 shrinkProgress) {
-	Ui::IconButton *editButton,
-	Ui::IconButton *deleteButton) {
 
 	const auto skipInternal = st::sendBoxAlbumGroupEditInternalSkip;
 	const auto size = st::sendBoxAlbumGroupHeight;
-	const auto clickArea = st::sendBoxAlbumGroupClickArea;
 	const auto skipRight = st::sendBoxAlbumGroupSkipRight;
 	const auto skipTop = st::sendBoxAlbumGroupSkipTop;
 	const auto groupWidth = size * 2 + skipInternal;
 
 	// If the width is tiny, it would be better to not display the buttons.
 	if (groupWidth > outerWidth) {
-		editButton->hide();
+		return QRect();
-		deleteButton->hide();
-		return;
-	} else if (deleteButton->isHidden() && editButton->isHidden()) {
-		editButton->show();
-		deleteButton->show();
 	}
 
 	// If the width is too small,
@@ -98,26 +96,14 @@ void PaintAlbumThumbButtons(
 		? (outerWidth - groupWidth) / 2
 		: outerWidth - skipRight - groupWidth);
 	const auto groupY = point.y() + skipTop;
-
-	const auto skipFromArea = (clickArea - size) / 2;
-	const auto buttonX = groupX - skipFromArea;
-	const auto buttonY = groupY - skipFromArea;
-
 	const auto deleteLeft = skipInternal + size;
 
-	editButton->moveToLeft(buttonX, buttonY);
+	p.setOpacity(1.0 - shrinkProgress);
-	deleteButton->moveToLeft(buttonX + deleteLeft, buttonY);
 
-	const auto alpha = 1.0 - shrinkProgress;
+	QRect groupRect(groupX, groupY, groupWidth, size);
-	editButton->setDisabled(alpha < 1);
-	deleteButton->setDisabled(alpha < 1);
-	p.setOpacity(alpha);
 	App::roundRect(
 		p,
-		groupX,
+		groupRect,
-		groupY,
-		groupWidth,
-		size,
 		st::callFingerprintBg,
 		SendFilesBoxAlbumGroupCorners);
 
@@ -136,6 +122,7 @@ void PaintAlbumThumbButtons(
 			size));
 	p.setOpacity(1);
 
+	return groupRect;
 }
 
 void FileDialogCallback(
@@ -262,6 +249,8 @@ public:
 	void paintFile(Painter &p, int left, int top, int outerWidth);
 
 	bool containsPoint(QPoint position) const;
+	bool buttonsContainPoint(QPoint position) const;
+	ButtonType buttonTypeFromPoint(QPoint position) const;
 	int distanceTo(QPoint position) const;
 	bool isPointAfter(QPoint position) const;
 	void moveInAlbum(QPoint to);
@@ -299,6 +288,8 @@ private:
 	Ui::Animations::Simple _suggestedMoveAnimation;
 	int _lastShrinkValue = 0;
 
+	QRect _lastRectOfButtons;
+
 	object_ptr<Ui::IconButton> _editMedia = nullptr;
 	object_ptr<Ui::IconButton> _deleteMedia = nullptr;
 
@@ -478,13 +469,11 @@ void AlbumThumb::paintInAlbum(
 		st::historyFileThumbPlay.paintInCenter(p, inner);
 	}
 
-	PaintAlbumThumbButtons(
+	_lastRectOfButtons = PaintAlbumThumbButtons(
 		p,
 		{ x, y },
 		geometry.width(),
-		shrinkProgress,
+		shrinkProgress);
-		_editMedia,
-		_deleteMedia);
 }
 
 void AlbumThumb::prepareCache(QSize size, int shrink) {
@@ -668,6 +657,19 @@ bool AlbumThumb::containsPoint(QPoint position) const {
 	return _layout.geometry.contains(position);
 }
 
+bool AlbumThumb::buttonsContainPoint(QPoint position) const {
+	return _lastRectOfButtons.contains(position);
+}
+
+ButtonType AlbumThumb::buttonTypeFromPoint(QPoint position) const {
+	if (!buttonsContainPoint(position)) {
+		return ButtonType::None;
+	}
+	return (position.x() < _lastRectOfButtons.center().x())
+		? ButtonType::Edit
+		: ButtonType::Delete;
+}
+
 int AlbumThumb::distanceTo(QPoint position) const {
 	const auto delta = (_layout.geometry.center() - position);
 	return QPoint::dotProduct(delta, delta);
@@ -1129,9 +1131,13 @@ private:
 	void updateSizeAnimated(const std::vector<Ui::GroupMediaLayout> &layout);
 	void updateSize();
 
-	int thumbIndexUnderCursor();
+	int thumbIndex(AlbumThumb *thumb);
-	void deleteThumbUnderCursor();
+	AlbumThumb *thumbUnderCursor();
-	void changeThumbUnderCursor();
+	void deleteThumbByIndex(int index);
+	void changeThumbByIndex(int index);
+	void thumbButtonsCallback(
+		not_null<AlbumThumb*> thumb,
+		ButtonType type);
 
 	void paintAlbum(Painter &p) const;
 	void paintPhotos(Painter &p, QRect clip) const;
@@ -1233,10 +1239,6 @@ void SendFilesBox::AlbumPreview::prepareThumbs() {
 		_thumbs.push_back(std::make_unique<AlbumThumb>(
 			_list.files[i],
 			layout[i]));
-		_thumbs[i]->addAlbumThumbButtons(
-			this,
-			[=] { changeThumbUnderCursor(); },
-			[=] { deleteThumbUnderCursor(); });
 	}
 	_thumbsHeight = countLayoutHeight(layout);
 	_photosHeight = ranges::accumulate(ranges::view::all(
@@ -1442,8 +1444,7 @@ void SendFilesBox::AlbumPreview::paintFiles(Painter &p, QRect clip) const {
 	}
 }
 
-int SendFilesBox::AlbumPreview::thumbIndexUnderCursor() {
+int SendFilesBox::AlbumPreview::thumbIndex(AlbumThumb *thumb) {
-	const auto thumb = findThumb(mapFromGlobal(QCursor::pos()));
 	if (!thumb) {
 		return -1;
 	}
@@ -1454,8 +1455,11 @@ int SendFilesBox::AlbumPreview::thumbIndexUnderCursor() {
 	return std::distance(_thumbs.begin(), thumbIt);
 }
 
-void SendFilesBox::AlbumPreview::deleteThumbUnderCursor() {
+AlbumThumb *SendFilesBox::AlbumPreview::thumbUnderCursor() {
-	auto index = thumbIndexUnderCursor();
+	return findThumb(mapFromGlobal(QCursor::pos()));
+}
+
+void SendFilesBox::AlbumPreview::deleteThumbByIndex(int index) {
 	if (index < 0) {
 		return;
 	}
@@ -1471,14 +1475,25 @@ void SendFilesBox::AlbumPreview::deleteThumbUnderCursor() {
 	_thumbDeleted.fire(std::move(index));
 }
 
-void SendFilesBox::AlbumPreview::changeThumbUnderCursor() {
+void SendFilesBox::AlbumPreview::changeThumbByIndex(int index) {
-	auto index = thumbIndexUnderCursor();
+	if (index < 0) {
-	if (index < -1) {
 		return;
 	}
 	_thumbChanged.fire(std::move(index));
 }
 
+void SendFilesBox::AlbumPreview::thumbButtonsCallback(
+	not_null<AlbumThumb*> thumb,
+	ButtonType type) {
+	const auto index = thumbIndex(thumb);
+
+	switch (type) {
+	case ButtonType::None: return;
+	case ButtonType::Edit: changeThumbByIndex(index); break;
+	case ButtonType::Delete: deleteThumbByIndex(index); break;
+	}
+}
+
 void SendFilesBox::AlbumPreview::mousePressEvent(QMouseEvent *e) {
 	if (_finishDragAnimation.animating()) {
 		return;
@@ -1486,6 +1501,10 @@ void SendFilesBox::AlbumPreview::mousePressEvent(QMouseEvent *e) {
 	const auto position = e->pos();
 	cancelDrag();
 	if (const auto thumb = findThumb(position)) {
+		if (thumb->buttonsContainPoint(e->pos())) {
+			thumbButtonsCallback(thumb, thumb->buttonTypeFromPoint(e->pos()));
+			return;
+		}
 		_paintedAbove = _suggestedThumb = _draggedThumb = thumb;
 		_draggedStartPosition = position;
 		_shrinkAnimation.start([=] { update(); }, 0., 1., kShrinkDuration);
@@ -1503,8 +1522,11 @@ void SendFilesBox::AlbumPreview::mouseMoveEvent(QMouseEvent *e) {
 		updateSuggestedDrag(_draggedThumb->center());
 		update();
 	} else {
-		const auto cursor = findThumb(e->pos())
+		const auto thumb = findThumb(e->pos());
-			? style::cur_sizeall
+		const auto cursor = thumb
+			? (thumb->buttonsContainPoint(e->pos())
+				? style::cur_pointer
+				: style::cur_sizeall)
 			: style::cur_default;
 		applyCursor(cursor);
 	}