FOSS/AyuGramDesktop
1
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2026-07-25 06:54:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[img-editor] Fixed non-clickable bottom area by masking editor controls.

Browse Source
This commit is contained in:
23rd
2026-03-09 11:03:50 +03:00
committed by John Preston
parent c4847e752c
commit 898eebbf4b
2 changed files with 50 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Telegram/SourceFiles/editor/photo_editor_controls.cpp
+49
View File
@@ -16,6 +16,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/painter.h"
#include "styles/style_editor.h"
#include <QRegion>
namespace Editor {
class EdgeButton final : public Ui::RippleButton {
@@ -329,6 +331,24 @@ PhotoEditorControls::PhotoEditorControls(
_paintTopButtons->setVisible(shown);
}, _paintBottomButtons->lifetime());
auto aboutChanges = _about
? rpl::merge(
_about->geometryValue() | rpl::to_empty,
_about->shownValue() | rpl::to_empty)
: rpl::never<>() | rpl::type_erased;
rpl::merge(
geometryValue() | rpl::to_empty,
_transformButtons->geometryValue() | rpl::to_empty,
_transformButtons->shownValue() | rpl::to_empty,
_paintBottomButtons->geometryValue() | rpl::to_empty,
_paintBottomButtons->shownValue() | rpl::to_empty,
_paintTopButtons->geometryValue() | rpl::to_empty,
_paintTopButtons->shownValue() | rpl::to_empty,
std::move(aboutChanges)
) | rpl::on_next([=] {
updateInputMask();
}, lifetime());
controllers->undoController->setPerformRequestChanges(rpl::merge(
_undoButton->clicks() | rpl::map_to(Undo::Undo),
_redoButton->clicks() | rpl::map_to(Undo::Redo),
@@ -403,6 +423,8 @@ PhotoEditorControls::PhotoEditorControls(
_flipButton->setIconOverride(icon, icon);
}, _flipButton->lifetime());
updateInputMask();
}
rpl::producer<int> PhotoEditorControls::rotateRequests() const {
@@ -517,6 +539,33 @@ void PhotoEditorControls::showAnimated(
}
}
void PhotoEditorControls::updateInputMask() {
auto region = QRegion();
const auto visibleRect = rect();
const auto add = [&](not_null<const QWidget*> widget) {
if (!widget->isHidden()) {
const auto geometry = widget->geometry() & visibleRect;
if (!geometry.isEmpty()) {
region += geometry;
}
}
};
add(_transformButtons);
add(_paintBottomButtons);
add(_paintTopButtons);
if (_about && !_about->isHidden()) {
const auto geometry = _about->geometry() & visibleRect;
if (!geometry.isEmpty()) {
region += geometry;
}
}
if (region.isEmpty()) {
clearMask();
} else {
setMask(region);
}
}
void PhotoEditorControls::applyMode(const PhotoEditorMode &mode) {
_mode = mode;
}