StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Screen grabber: Moving from button -> flyout -> button doesn't collapse

Browse Source
This commit is contained in:
Stefan Merettig 2015-03-25 14:51:14 +01:00 committed by tux3
parent 7ab64d5628
commit 9539a38f15
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widget/form/chatform.cpp
View File

@ -874,13 +874,13 @@ void ChatForm::doScreenshot()
{
disconnect(fileFlyout, &FlyoutOverlayWidget::hidden, this, &ChatForm::doScreenshot);
ScreenshotGrabber* screenshotGrabber = new ScreenshotGrabber (this);
ScreenshotGrabber* screenshotGrabber = new ScreenshotGrabber(this);
connect(screenshotGrabber, &ScreenshotGrabber::screenshotTaken, this, &ChatForm::onScreenshotTaken);
screenshotGrabber->showGrabber();
}
void ChatForm::onScreenshotTaken (const QPixmap &pixmap) {
void ChatForm::onScreenshotTaken(const QPixmap &pixmap) {
QTemporaryFile file("qTox-Screenshot-XXXXXXXX.png");
if (!file.open())

8
src/widget/form/genericchatform.cpp
View File

@ -189,6 +189,7 @@ GenericChatForm::GenericChatForm(QWidget *parent)
fileFlyout->setFixedSize(24, 24);
fileFlyout->setParent(this);
fileButton->installEventFilter(this);
fileFlyout->installEventFilter(this);
}
void GenericChatForm::showFileMenu()
@ -411,7 +412,7 @@ void GenericChatForm::insertChatMessage(ChatMessage::Ptr msg)
bool GenericChatForm::eventFilter(QObject* object, QEvent* event)
{
if (object != this->fileButton)
if (object != this->fileButton && object != this->fileFlyout)
return false;
switch(event->type())
@ -422,9 +423,10 @@ bool GenericChatForm::eventFilter(QObject* object, QEvent* event)
case QEvent::Leave: {
QPoint pos = mapFromGlobal(QCursor::pos());
QRect rect (fileFlyout->pos(), fileFlyout->size());
QRect fileRect(fileFlyout->pos(), fileFlyout->size());
fileRect = fileRect.united(QRect(fileButton->pos(), fileButton->size()));
if (!rect.contains(pos))
if (!fileRect.contains(pos))
hideFileMenu();
} break;

6
src/widget/tool/flyoutoverlaywidget.cpp
View File

@ -88,12 +88,6 @@ void FlyoutOverlayWidget::animateHide()
animation->start();
}
void FlyoutOverlayWidget::leaveEvent(QEvent* event)
{
Q_UNUSED(event);
animateHide();
}
void FlyoutOverlayWidget::finishedAnimation()
{
bool hide = (animation->direction() == QAbstractAnimation::Backward);

3
src/widget/tool/flyoutoverlaywidget.h
View File

@ -44,9 +44,6 @@ signals:
void hidden();
protected:
void leaveEvent(QEvent* event);
private:
void finishedAnimation();