Bugfix for #253 (Grafik not proper rebuild after change settings)

This commit is contained in:
doitux
2014-01-10 00:14:24 +01:00
parent e16f949ccd
commit 1fe5480b63
2 changed files with 8 additions and 11 deletions
+3 -3
View File
@@ -853,7 +853,6 @@ void gameTableImpl::applySettings(settingsDialogImpl* mySettingsDialog)
#ifndef GUI_800x480 //currently not for mobile guis because we just use the default style here
refreshGameTableStyle();
#endif
//qDebug() << "table: " << myGameTableStyle->getStyleDescription() << myGameTableStyle->getState();
if(this->isVisible() && myGameTableStyle->getState() != GT_STYLE_OK) myGameTableStyle->showErrorMessage();
//blind buttons refresh
@@ -1103,7 +1102,6 @@ void gameTableImpl::refreshPlayerAvatar()
switch(getCurrentSeatState((*it_c))) {
case SEAT_ACTIVE: {
// qDebug() << seatPlace << "AVATAR ACTIVE";
playerAvatarLabelArray[(*it_c)->getMyID()]->setPixmapAndCountry(avatarPic, countryString, seatPlace);
}
break;
@@ -4300,7 +4298,9 @@ void gameTableImpl::restoreGameTableGeometry()
{
if(myConfig->readConfigInt("GameTableFullScreenSave")) {
#ifndef GUI_800x480
if(actionFullScreen->isEnabled()) this->showFullScreen();
if(actionFullScreen->isEnabled()) {
this->showFullScreen();
}
#endif
} else {
//resize only if style size allow this and if NOT fixed windows size
+5 -8
View File
@@ -1635,10 +1635,6 @@ void GameTableStyleReader::setTabWidgetStyle(QTabWidget *tw, QTabBar *tb)
void GameTableStyleReader::setWindowsGeometry(gameTableImpl *gt)
{
if(IfFixedWindowSize.toInt()) {
gt->setMinimumSize(FixedWindowWidth.toInt(), FixedWindowHeight.toInt());
gt->setMaximumSize(FixedWindowWidth.toInt(), FixedWindowHeight.toInt());
gt->resize(FixedWindowWidth.toInt(), FixedWindowHeight.toInt());
#ifndef GUI_800x480
QDesktopWidget dw;
int availableWidth = dw.screenGeometry().width();
@@ -1652,12 +1648,11 @@ void GameTableStyleReader::setWindowsGeometry(gameTableImpl *gt)
gt->move(50,50);
}
}
gt->setMinimumSize(FixedWindowWidth.toInt(), FixedWindowHeight.toInt());
gt->setMaximumSize(FixedWindowWidth.toInt(), FixedWindowHeight.toInt());
gt->resize(FixedWindowWidth.toInt(), FixedWindowHeight.toInt());
#endif
} else {
gt->setMinimumSize(MinimumWindowWidth.toInt(), MinimumWindowHeight.toInt());
gt->setMaximumSize(MaximumWindowWidth.toInt(), MaximumWindowHeight.toInt());
gt->resize(MinimumWindowWidth.toInt(), MinimumWindowHeight.toInt());
#ifndef GUI_800x480
QDesktopWidget dw;
int availableWidth = dw.screenGeometry().width();
@@ -1671,6 +1666,8 @@ void GameTableStyleReader::setWindowsGeometry(gameTableImpl *gt)
gt->move(50,50);
}
}
gt->setMinimumSize(MinimumWindowWidth.toInt(), MinimumWindowHeight.toInt());
gt->setMaximumSize(MaximumWindowWidth.toInt(), MaximumWindowHeight.toInt());
#endif
}