From 1fe5480b63a7629ab650b20f5d43a1c820c813cd Mon Sep 17 00:00:00 2001 From: doitux Date: Fri, 10 Jan 2014 00:14:24 +0100 Subject: [PATCH] Bugfix for #253 (Grafik not proper rebuild after change settings) --- src/gui/qt/gametable/gametableimpl.cpp | 6 +++--- src/gui/qt/styles/gametablestylereader.cpp | 13 +++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index 92688298..3d31711f 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -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 diff --git a/src/gui/qt/styles/gametablestylereader.cpp b/src/gui/qt/styles/gametablestylereader.cpp index 7da2620d..03097585 100644 --- a/src/gui/qt/styles/gametablestylereader.cpp +++ b/src/gui/qt/styles/gametablestylereader.cpp @@ -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 }