procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Replaced raw PopupMenu pointer with unique_qptr in OverlayWidget.

Browse source
This commit is contained in:
23rd 2020-11-17 04:29:27 +03:00 committed by John Preston
parent dd7598a701
commit 2d906bddb2
2 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
View file

@ -1162,8 +1162,6 @@ void OverlayWidget::clearSession() {
_animationOpacities.clear();
}
clearStreaming();
delete _menu;
_menu = nullptr;
setContext(v::null);
_from = nullptr;
_fromName = QString();
@ -1620,7 +1618,9 @@ void OverlayWidget::onDelete() {
}
void OverlayWidget::onOverview() {
if (_menu) _menu->hideMenu(true);
if (_menu) {
_menu->hideMenu(true);
}
update();
if (const auto overviewType = computeOverviewType()) {
close();
@ -3858,7 +3858,9 @@ void OverlayWidget::preloadData(int delta) {
void OverlayWidget::mousePressEvent(QMouseEvent *e) {
updateOver(e->pos());
if (_menu || !_receiveMouse) return;
if (_menu || !_receiveMouse) {
return;
}
ClickHandler::pressed();
@ -4138,16 +4140,18 @@ void OverlayWidget::mouseReleaseEvent(QMouseEvent *e) {
void OverlayWidget::contextMenuEvent(QContextMenuEvent *e) {
if (e->reason() != QContextMenuEvent::Mouse || QRect(_x, _y, _w, _h).contains(e->pos())) {
if (_menu) {
_menu->deleteLater();
_menu = nullptr;
}
_menu = new Ui::PopupMenu(this, st::mediaviewPopupMenu);
_menu = base::make_unique_q<Ui::PopupMenu>(
this,
st::mediaviewPopupMenu);
updateActions();
for_const (auto &action, _actions) {
_menu->addAction(action.text, this, action.member);
}
connect(_menu, SIGNAL(destroyed(QObject*)), this, SLOT(onMenuDestroy(QObject*)));
_menu->setDestroyedCallback(crl::guard(this, [=] {
activateControls();
_receiveMouse = false;
InvokeQueued(this, [=] { receiveMouse(); });
}));
_menu->popup(e->globalPos());
e->accept();
activateControls();
@ -4309,7 +4313,9 @@ void OverlayWidget::setVisibleHook(bool visible) {
assignMediaPointer(nullptr);
_preloadPhotos.clear();
_preloadDocuments.clear();
if (_menu) _menu->hideMenu(true);
if (_menu) {
_menu->hideMenu(true);
}
_controlsHideTimer.cancel();
_controlsState = ControlsShown;
_controlsOpacity = anim::value(1, 1);
@ -4333,15 +4339,6 @@ void OverlayWidget::setVisibleHook(bool visible) {
}
}
void OverlayWidget::onMenuDestroy(QObject *obj) {
if (_menu == obj) {
_menu = nullptr;
activateControls();
}
_receiveMouse = false;
InvokeQueued(this, [=] { receiveMouse(); });
}
void OverlayWidget::receiveMouse() {
_receiveMouse = true;
}

3
Telegram/SourceFiles/media/view/media_view_overlay_widget.h
View file

@ -128,7 +128,6 @@ private slots:
void onDelete();
void onOverview();
void onCopy();
void onMenuDestroy(QObject *obj);
void receiveMouse();
void onPhotoAttachedStickers();
void onDocumentAttachedStickers();
@ -498,7 +497,7 @@ private:
anim::value _controlsOpacity;
bool _mousePressed = false;
Ui::PopupMenu *_menu = nullptr;
base::unique_qptr<Ui::PopupMenu> _menu;
object_ptr<Ui::DropdownMenu> _dropdown;
base::Timer _dropdownShowTimer;