noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #615 from LajamerrMittesdine/master

Browse source 
Fix QMenus from starting out of screen boundaries. Fixes #517 #571 #572
This commit is contained in:
pajlada 2018-07-13 22:03:46 +02:00 committed by GitHub
commit 13b7aec927
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/widgets/helper/ChannelView.cpp
View file

@ -1093,8 +1093,7 @@ void ChannelView::addContextMenuItems(const MessageLayoutElement *hoveredElement
// // insert into input // // insert into input
// }); // });
menu->move(QCursor::pos()); menu->popup(QCursor::pos());
menu->show();
menu->raise(); menu->raise();
return; return;

8
src/widgets/splits/SplitHeader.cpp
View file

@ -56,9 +56,7 @@ SplitHeader::SplitHeader(Split *_split)
QTimer::singleShot(80, this, [&, this] { QTimer::singleShot(80, this, [&, this] {
ChannelPtr _channel = this->split_->getChannel(); ChannelPtr _channel = this->split_->getChannel();
if (_channel->hasModRights()) { if (_channel->hasModRights()) {
this->modeMenu_.move( this->modeMenu_.popup(QCursor::pos());
this->modeButton_->mapToGlobal(QPoint(0, this->modeButton_->height())));
this->modeMenu_.show();
} }
}); });
}); });
@ -83,9 +81,7 @@ SplitHeader::SplitHeader(Split *_split)
this->addDropdownItems(dropdown.getElement()); this->addDropdownItems(dropdown.getElement());
QObject::connect(dropdown.getElement(), &RippleEffectButton::leftMousePress, this, [this] { QObject::connect(dropdown.getElement(), &RippleEffectButton::leftMousePress, this, [this] {
QTimer::singleShot(80, [&, this] { QTimer::singleShot(80, [&, this] {
this->dropdownMenu_.move( this->dropdownMenu_.popup(QCursor::pos());
this->dropdownButton_->mapToGlobal(QPoint(0, this->dropdownButton_->height())));
this->dropdownMenu_.show();
}); });
}); });
} }