thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove QPropertyAnimation from modals to work around a regression on Qt 5.10.1 (#87)

Browse source
This commit is contained in:
Konstantinos Sideris 2018-02-17 18:43:40 +02:00
parent 59e4148a7c
commit fdd5051dcf
8 changed files with 18 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ChatPage.cc
View file

@ -680,7 +680,7 @@ ChatPage::showQuickSwitcher()
connect(quickSwitcher_.data(), &QuickSwitcher::closing, this, [=]() {
if (!this->quickSwitcherModal_.isNull())
this->quickSwitcherModal_->fadeOut();
this->quickSwitcherModal_->hide();
this->text_input_->setFocus(Qt::FocusReason::PopupFocusReason);
});
}
@ -689,7 +689,6 @@ ChatPage::showQuickSwitcher()
quickSwitcherModal_ = QSharedPointer<OverlayModal>(
new OverlayModal(MainWindow::instance(), quickSwitcher_.data()),
[=](OverlayModal *modal) { modal->deleteLater(); });
quickSwitcherModal_->setDuration(0);
quickSwitcherModal_->setColor(QColor(30, 30, 30, 170));
}
@ -704,7 +703,7 @@ ChatPage::showQuickSwitcher()
}
quickSwitcher_->setRoomList(rooms);
quickSwitcherModal_->fadeIn();
quickSwitcherModal_->show();
}
void
@ -922,12 +921,11 @@ ChatPage::showReadReceipts(const QString &event_id)
receiptsModal_ = QSharedPointer<OverlayModal>(
new OverlayModal(MainWindow::instance(), receiptsDialog_.data()),
[=](OverlayModal *modal) { modal->deleteLater(); });
receiptsModal_->setDuration(0);
receiptsModal_->setColor(QColor(30, 30, 30, 170));
}
receiptsDialog_->addUsers(cache_->readReceipts(event_id, current_room_));
receiptsModal_->fadeIn();
receiptsModal_->show();
}
void