1
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00

Merge branch 'Falkon/3.0'

This commit is contained in:
David Rosca 2018-03-24 23:05:40 +01:00
commit beab61606d
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8

View File

@ -128,7 +128,7 @@ void TabIcon::show()
m_hideTimer->stop();
if (isVisible()) {
if (isVisible() && width() == 16) {
return;
}
@ -139,7 +139,11 @@ void TabIcon::show()
void TabIcon::hide()
{
if (shouldBeVisible() || isHidden()) {
if (shouldBeVisible()) {
return;
}
if (isHidden() && width() == 1) {
return;
}
@ -165,6 +169,13 @@ bool TabIcon::event(QEvent *event)
event->accept();
return true;
}
} else if (event->type() == QEvent::Resize) {
// Force resize to correct size
if (isVisible()) {
QTimer::singleShot(0, this, &TabIcon::show);
} else {
QTimer::singleShot(0, this, &TabIcon::hide);
}
}
return QWidget::event(event);