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

Fixed tooltip now closing properly. Fixes #159

Browse source
This commit is contained in:
fourtf 2017-12-24 23:56:08 +01:00
parent 91099c028e
commit 0ca4a098e1
4 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/widgets/basewidget.cpp
View file

@ -104,7 +104,14 @@ bool BaseWidget::nativeEvent(const QByteArray &eventType, void *message, long *r
} }
#endif #endif
void BaseWidget::focusOutEvent(QFocusEvent *) void BaseWidget::changeEvent(QEvent *)
{
if (this->isWindow) {
TooltipWidget::getInstance()->hide();
}
}
void BaseWidget::leaveEvent(QEvent *)
{ {
if (this->isWindow) { if (this->isWindow) {
TooltipWidget::getInstance()->hide(); TooltipWidget::getInstance()->hide();

3
src/widgets/basewidget.hpp
View file

@ -28,7 +28,8 @@ protected:
virtual bool nativeEvent(const QByteArray &eventType, void *message, long *result) override; virtual bool nativeEvent(const QByteArray &eventType, void *message, long *result) override;
#endif #endif
virtual void focusOutEvent(QFocusEvent *) override; virtual void changeEvent(QEvent *) override;
virtual void leaveEvent(QEvent *) override;
// XXX: Should this be pure virtual? // XXX: Should this be pure virtual?
// fourtf: hell no // fourtf: hell no

14
src/widgets/window.cpp
View file

@ -107,20 +107,6 @@ void Window::closeEvent(QCloseEvent *)
this->closed(); this->closed();
} }
// void Window::changeEvent(QEvent *event)
//{
// if (!this->isActiveWindow()) {
// this->lostFocus.invoke();
// }
// BaseWidget::changeEvent(event);
//}
// void Window::leaveEvent(QEvent *event)
//{
// this->lostFocus.invoke();
// BaseWidget::leaveEvent(event);
//}
void Window::refreshTheme() void Window::refreshTheme()
{ {
QPalette palette; QPalette palette;

5
src/widgets/window.hpp
View file

@ -56,14 +56,9 @@ public:
boost::signals2::signal<void()> closed; boost::signals2::signal<void()> closed;
// pajlada::Signals::NoArgSignal lostFocus;
protected: protected:
virtual void closeEvent(QCloseEvent *event) override; virtual void closeEvent(QCloseEvent *event) override;
// virtual void changeEvent(QEvent *event) override;
// virtual void leaveEvent(QEvent *event) override;
private: private:
float dpi; float dpi;