From 7624914832f4027de4ece38c59e88115c20586d0 Mon Sep 17 00:00:00 2001 From: doitux Date: Fri, 19 Jun 2009 21:58:35 +0000 Subject: [PATCH] new blinking startbutton fix --- .../gamelobbydialog/gamelobbydialogimpl.cpp | 25 +++++++++++++------ .../qt/gamelobbydialog/gamelobbydialogimpl.h | 2 ++ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp index df064257..e7f443f0 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp @@ -47,13 +47,16 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(startWindowImpl *parent, ConfigFile *c) blinkingButtonAnimationTimer = new QTimer(this); blinkingButtonAnimationTimer->setInterval(1000); - //fetch enabled start button colors for blinking + //fetch button colors for blinking groupBox_GameInfo->setEnabled(true); pushButton_StartGame->setEnabled(true); defaultStartButtonColor = pushButton_StartGame->palette().button().color(); defaultStartButtonTextColor = pushButton_StartGame->palette().buttonText().color(); pushButton_StartGame->setEnabled(false); groupBox_GameInfo->setEnabled(false); + disabledStartButtonColor = pushButton_StartGame->palette().button().color(); + disabledStartButtonTextColor = pushButton_StartGame->palette().buttonText().color(); + myGameListModel = new QStandardItemModel(this); myGameListSortFilterProxyModel = new MyGameListSortFilterProxyModel(this); @@ -602,13 +605,19 @@ void gameLobbyDialogImpl::blinkingStartButtonAnimation() { blinkingButtonAnimationState = false; } else { - QPalette p = pushButton_StartGame->palette(); - p.setColor(QPalette::Button, defaultStartButtonColor); - p.setColor(QPalette::ButtonText, defaultStartButtonTextColor); - pushButton_StartGame->setPalette(p); - blinkingButtonAnimationState = true; - if(!pushButton_StartGame->isEnabled()) { - pushButton_StartGame->setEnabled(false); + if(pushButton_StartGame->isEnabled()) { + QPalette p = pushButton_StartGame->palette(); + p.setColor(QPalette::Button, defaultStartButtonColor); + p.setColor(QPalette::ButtonText, defaultStartButtonTextColor); + pushButton_StartGame->setPalette(p); + blinkingButtonAnimationState = true; + } + else { + QPalette p = pushButton_StartGame->palette(); + p.setColor(QPalette::Button, disabledStartButtonColor); + p.setColor(QPalette::ButtonText, disabledStartButtonTextColor); + pushButton_StartGame->setPalette(p); + blinkingButtonAnimationState = true; } } } diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h index b40bd9c6..679f4b62 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h @@ -132,6 +132,8 @@ private: bool blinkingButtonAnimationState; QColor defaultStartButtonColor; QColor defaultStartButtonTextColor; + QColor disabledStartButtonColor; + QColor disabledStartButtonTextColor; LobbyChat *myChat; int keyUpCounter; QStandardItemModel *myGameListModel;