Skip to content

Make connect of new screen happens after the animation is finished #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reesque merged 1 commit into from
Oct 14, 2025
Merged

Make connect of new screen happens after the animation is finished #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/core/controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ void Controller::connectGamepad(int id)

void Controller::controllerButtonUpChanged(bool value)
{
if (!value && !m_dpadDebounceTimer->isActive())
if (value && !m_dpadDebounceTimer->isActive())
{
m_dpadDebounceTimer->start();
emit triggerUpAction();
Expand All @@ -99,7 +99,7 @@ void Controller::controllerButtonUpChanged(bool value)

void Controller::controllerButtonDownChanged(bool value)
{
if (!value && !m_dpadDebounceTimer->isActive())
if (value && !m_dpadDebounceTimer->isActive())
{
m_dpadDebounceTimer->start();
emit triggerDownAction();
Expand All @@ -108,7 +108,7 @@ void Controller::controllerButtonDownChanged(bool value)

void Controller::controllerButtonLeftChanged(bool value)
{
if (!value && !m_dpadDebounceTimer->isActive())
if (value && !m_dpadDebounceTimer->isActive())
{
m_dpadDebounceTimer->start();
emit triggerLeftAction();
Expand All @@ -117,7 +117,7 @@ void Controller::controllerButtonLeftChanged(bool value)

void Controller::controllerButtonRightChanged(bool value)
{
if (!value && !m_dpadDebounceTimer->isActive())
if (value && !m_dpadDebounceTimer->isActive())
{
m_dpadDebounceTimer->start();
emit triggerRightAction();
Expand All @@ -126,7 +126,7 @@ void Controller::controllerButtonRightChanged(bool value)

void Controller::controllerButtonAChanged(bool value)
{
if (!value && !m_faceBtnDebounceTimer->isActive())
if (value && !m_faceBtnDebounceTimer->isActive())
{
m_faceBtnDebounceTimer->start();
emit triggerConfirmAction();
Expand All @@ -135,7 +135,7 @@ void Controller::controllerButtonAChanged(bool value)

void Controller::controllerButtonBChanged(bool value)
{
if (!value && !m_faceBtnDebounceTimer->isActive())
if (value && !m_faceBtnDebounceTimer->isActive())
{
m_faceBtnDebounceTimer->start();
emit triggerBackAction();
Expand Down
61 changes: 37 additions & 24 deletions src/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,19 +204,6 @@ void MainWindow::switchScreenTo(ScreenType screenType,
screenStack->layout()->addWidget(newScreen);
newScreen->setFocus();
prevScreen = newScreen->getPrevScreen();
connect(newScreen, &Screen::switchScreenTo, this, &MainWindow::switchScreenTo);
connect(newScreen, &Screen::switchToPreviousScreen, this, &MainWindow::switchToPreviousScreen);
connect(newScreen, &Screen::playTrack, m_mediaPlayer.get(), &MediaPlayer::playTrack);
connect(newScreen, &Screen::queueTrack, m_mediaPlayer.get(), &MediaPlayer::queueTrack);

connect(m_controller.get(), &Controller::triggerLeftAction, newScreen, &Screen::leftAction);
connect(m_controller.get(), &Controller::triggerRightAction, newScreen, &Screen::rightAction);
connect(m_controller.get(), &Controller::triggerUpAction, newScreen, &Screen::upAction);
connect(m_controller.get(), &Controller::triggerDownAction, newScreen, &Screen::downAction);
connect(m_controller.get(), &Controller::triggerBackAction, newScreen, &Screen::backAction);
connect(m_controller.get(), &Controller::triggerConfirmAction, newScreen, &Screen::confirmAction);

connect(this, &MainWindow::resizeEvent, newScreen, &Screen::resizeEvent);

// Delete old screen
if (screenStack->layout()->count() > 1)
Expand Down Expand Up @@ -283,17 +270,7 @@ void MainWindow::switchScreenTo(ScreenType screenType,

connect(group, &QParallelAnimationGroup::finished, [=]() {
screenStack->setCurrentIndex(1);
disconnect(oldScreen, &Screen::switchScreenTo, this, &MainWindow::switchScreenTo);
disconnect(oldScreen, &Screen::switchToPreviousScreen, this, &MainWindow::switchToPreviousScreen);

disconnect(m_controller.get(), &Controller::triggerLeftAction, oldScreen, &Screen::leftAction);
disconnect(m_controller.get(), &Controller::triggerRightAction, oldScreen, &Screen::rightAction);
disconnect(m_controller.get(), &Controller::triggerUpAction, oldScreen, &Screen::upAction);
disconnect(m_controller.get(), &Controller::triggerDownAction, oldScreen, &Screen::downAction);
disconnect(m_controller.get(), &Controller::triggerBackAction, oldScreen, &Screen::backAction);
disconnect(m_controller.get(), &Controller::triggerConfirmAction, oldScreen, &Screen::confirmAction);

disconnect(this, &MainWindow::resizeEvent, oldScreen, &Screen::resizeEvent);
updateConnect(newScreen, oldScreen);

QLayoutItem *item = screenStack->layout()->takeAt(0);
if (item) {
Expand All @@ -310,6 +287,10 @@ void MainWindow::switchScreenTo(ScreenType screenType,

group->start(QAbstractAnimation::DeleteWhenStopped);
}
else
{
updateConnect(newScreen);
}
}

void MainWindow::switchToPreviousScreen(QVector<QVariant> args)
Expand All @@ -324,3 +305,35 @@ void MainWindow::resizeEvent(QResizeEvent* event)
{
QMainWindow::resizeEvent(event);
}

void MainWindow::updateConnect(Screen *newScreen, Screen *oldScreen)
{
connect(newScreen, &Screen::switchScreenTo, this, &MainWindow::switchScreenTo);
connect(newScreen, &Screen::switchToPreviousScreen, this, &MainWindow::switchToPreviousScreen);
connect(newScreen, &Screen::playTrack, m_mediaPlayer.get(), &MediaPlayer::playTrack);
connect(newScreen, &Screen::queueTrack, m_mediaPlayer.get(), &MediaPlayer::queueTrack);

connect(m_controller.get(), &Controller::triggerLeftAction, newScreen, &Screen::leftAction);
connect(m_controller.get(), &Controller::triggerRightAction, newScreen, &Screen::rightAction);
connect(m_controller.get(), &Controller::triggerUpAction, newScreen, &Screen::upAction);
connect(m_controller.get(), &Controller::triggerDownAction, newScreen, &Screen::downAction);
connect(m_controller.get(), &Controller::triggerBackAction, newScreen, &Screen::backAction);
connect(m_controller.get(), &Controller::triggerConfirmAction, newScreen, &Screen::confirmAction);

connect(this, &MainWindow::resizeEvent, newScreen, &Screen::resizeEvent);

if (oldScreen)
{
disconnect(oldScreen, &Screen::switchScreenTo, this, &MainWindow::switchScreenTo);
disconnect(oldScreen, &Screen::switchToPreviousScreen, this, &MainWindow::switchToPreviousScreen);

disconnect(m_controller.get(), &Controller::triggerLeftAction, oldScreen, &Screen::leftAction);
disconnect(m_controller.get(), &Controller::triggerRightAction, oldScreen, &Screen::rightAction);
disconnect(m_controller.get(), &Controller::triggerUpAction, oldScreen, &Screen::upAction);
disconnect(m_controller.get(), &Controller::triggerDownAction, oldScreen, &Screen::downAction);
disconnect(m_controller.get(), &Controller::triggerBackAction, oldScreen, &Screen::backAction);
disconnect(m_controller.get(), &Controller::triggerConfirmAction, oldScreen, &Screen::confirmAction);

disconnect(this, &MainWindow::resizeEvent, oldScreen, &Screen::resizeEvent);
}
}
3 changes: 3 additions & 0 deletions src/mainwindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ private slots:
ScreenAnimationType screenAnimationType = ScreenAnimationType::Forward);
void switchToPreviousScreen(QVector<QVariant> args);

private:
void updateConnect(Screen *newScreen, Screen *oldScreen = nullptr);

private:
Ui::MainWindow *ui;
//QWidget *screenBox;
Expand Down