Browse Source

Screen grabber: Hide the flyout when the chat form is hidden.

pull/1552/merge
Stefan Merettig 10 years ago committed by tux3
parent
commit
f982938919
  1. 4
      src/widget/form/chatform.cpp
  2. 6
      src/widget/form/genericchatform.cpp
  3. 1
      src/widget/form/genericchatform.h

4
src/widget/form/chatform.cpp

@ -985,10 +985,12 @@ void ChatForm::show(Ui::MainWindow &ui) @@ -985,10 +985,12 @@ void ChatForm::show(Ui::MainWindow &ui)
callConfirm->show();
}
void ChatForm::hideEvent(QHideEvent*)
void ChatForm::hideEvent(QHideEvent* event)
{
if (callConfirm)
callConfirm->hide();
GenericChatForm::hideEvent(event);
}
OfflineMsgEngine *ChatForm::getOfflineMsgEngine()

6
src/widget/form/genericchatform.cpp

@ -410,6 +410,12 @@ void GenericChatForm::insertChatMessage(ChatMessage::Ptr msg) @@ -410,6 +410,12 @@ void GenericChatForm::insertChatMessage(ChatMessage::Ptr msg)
chatWidget->insertChatlineAtBottom(std::dynamic_pointer_cast<ChatLine>(msg));
}
void GenericChatForm::hideEvent(QHideEvent* event)
{
hideFileMenu();
QWidget::hideEvent(event);
}
bool GenericChatForm::eventFilter(QObject* object, QEvent* event)
{
if (object != this->fileButton && object != this->fileFlyout)

1
src/widget/form/genericchatform.h

@ -84,6 +84,7 @@ protected slots: @@ -84,6 +84,7 @@ protected slots:
protected:
QString resolveToxID(const ToxID &id);
void insertChatMessage(ChatMessage::Ptr msg);
void hideEvent(QHideEvent* event);
ToxID previousId;
QDateTime prevMsgDateTime;

Loading…
Cancel
Save