From cd5c704c06d42bf771b5e40b16e95bebfc569702 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 17 Jul 2026 02:43:40 +0400 Subject: [PATCH] Select and drag photo blocks by the photo media. --- Telegram/SourceFiles/iv/editor/iv_editor_widget.cpp | 13 +++++++------ Telegram/SourceFiles/iv/editor/iv_editor_widget.h | 1 - 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Telegram/SourceFiles/iv/editor/iv_editor_widget.cpp b/Telegram/SourceFiles/iv/editor/iv_editor_widget.cpp index 75f3183e39..cfe7313717 100644 --- a/Telegram/SourceFiles/iv/editor/iv_editor_widget.cpp +++ b/Telegram/SourceFiles/iv/editor/iv_editor_widget.cpp @@ -6368,6 +6368,13 @@ bool Widget::showMediaMenuFromHit( == Markdown::MediaActivationKind::None) { return false; } + if (clickKind == MediaClickKind::Left) { + const auto block = BlockFromPath(_state->richPage(), *path); + if (block && (block->kind == RichPage::BlockKind::Photo)) { + editPhotoBlock(*path); + return true; + } + } showSimpleMediaMenu(*path, globalPos); return true; } else if (const auto path = groupedMediaBlockPathFromHit(hit)) { @@ -6743,9 +6750,6 @@ Widget::PressedMediaControl Widget::mediaControlHitTest( return { MediaControl::ThreeDots, *path }; } else if (layout.plus.contains(articlePoint)) { return { MediaControl::Plus, *path }; - } else if ((block->kind == RichPage::BlockKind::Photo) - && geo.visibleMediaRect.contains(articlePoint)) { - return { MediaControl::MediaPixels, *path }; } } return {}; @@ -7283,9 +7287,6 @@ void Widget::mouseReleaseEvent(QMouseEvent *e) { case MediaControl::Plus: addToCollageFromBlock(pressed.path); break; - case MediaControl::MediaPixels: - editPhotoBlock(pressed.path); - break; case MediaControl::UploadRadial: if (pressed.itemIndex >= 0) { cancelMediaUploadForGroupedItem( diff --git a/Telegram/SourceFiles/iv/editor/iv_editor_widget.h b/Telegram/SourceFiles/iv/editor/iv_editor_widget.h index 1f6c83edc7..5986c8be67 100644 --- a/Telegram/SourceFiles/iv/editor/iv_editor_widget.h +++ b/Telegram/SourceFiles/iv/editor/iv_editor_widget.h @@ -273,7 +273,6 @@ private: None, ThreeDots, Plus, - MediaPixels, UploadRadial, LayoutSwitch, };