android gui fix for applysettings when quit settingsdialog
This commit is contained in:
@@ -683,11 +683,13 @@ void gameTableImpl::callSettingsDialog()
|
|||||||
|
|
||||||
void gameTableImpl::applySettings(settingsDialogImpl* mySettingsDialog)
|
void gameTableImpl::applySettings(settingsDialogImpl* mySettingsDialog)
|
||||||
{
|
{
|
||||||
|
#ifndef GUI_800x480 //currently not for mobile guis because we just use the default style here
|
||||||
//apply card deck style
|
//apply card deck style
|
||||||
myCardDeckStyle->readStyleFile(QString::fromUtf8(myConfig->readConfigString("CurrentCardDeckStyle").c_str()));
|
myCardDeckStyle->readStyleFile(QString::fromUtf8(myConfig->readConfigString("CurrentCardDeckStyle").c_str()));
|
||||||
checkActionLabelPosition();
|
checkActionLabelPosition();
|
||||||
//apply game table style
|
//apply game table style
|
||||||
myGameTableStyle->readStyleFile(QString::fromUtf8(myConfig->readConfigString("CurrentGameTableStyle").c_str()));
|
myGameTableStyle->readStyleFile(QString::fromUtf8(myConfig->readConfigString("CurrentGameTableStyle").c_str()));
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef GUI_800x480
|
#ifdef GUI_800x480
|
||||||
//cardschancemonitor show/hide
|
//cardschancemonitor show/hide
|
||||||
@@ -825,8 +827,9 @@ void gameTableImpl::applySettings(settingsDialogImpl* mySettingsDialog)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#ifndef GUI_800x480 //currently not for mobile guis because we just use the default style here
|
||||||
refreshGameTableStyle();
|
refreshGameTableStyle();
|
||||||
|
#endif
|
||||||
//qDebug() << "table: " << myGameTableStyle->getStyleDescription() << myGameTableStyle->getState();
|
//qDebug() << "table: " << myGameTableStyle->getStyleDescription() << myGameTableStyle->getState();
|
||||||
if(this->isVisible() && myGameTableStyle->getState() != GT_STYLE_OK) myGameTableStyle->showErrorMessage();
|
if(this->isVisible() && myGameTableStyle->getState() != GT_STYLE_OK) myGameTableStyle->showErrorMessage();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user