sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

android changes on gametable

Browse Source
This commit is contained in:
doitux
2014-05-27 08:03:30 +02:00
parent df2cf5287a
commit ceb123d21d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gametable/gametableimpl.cpp
+6 -3
View File
@@ -69,7 +69,7 @@
#ifdef ANDROID #ifdef ANDROID
#ifndef ANDROID_TEST #ifndef ANDROID_TEST
#include "QtGui/5.2.0/QtGui/qpa/qplatformnativeinterface.h" #include "QtGui/5.3.0/QtGui/qpa/qplatformnativeinterface.h"
#include <jni.h> #include <jni.h>
#endif #endif
#endif #endif
@@ -3254,7 +3254,6 @@ bool gameTableImpl::eventFilter(QObject *obj, QEvent *event)
myChat->nickAutoCompletition(); myChat->nickAutoCompletition();
return true; return true;
} else if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Back) { } else if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Back) {
event->ignore();
closeGameTable(); closeGameTable();
return true; return true;
} else if (event->type() == QEvent::Close) { } else if (event->type() == QEvent::Close) {
@@ -4297,11 +4296,12 @@ void gameTableImpl::restoreGameTableGeometry()
} }
#endif #endif
} else { } else {
#ifndef ANDROID
//resize only if style size allow this and if NOT fixed windows size //resize only if style size allow this and if NOT fixed windows size
if(!myGameTableStyle->getIfFixedWindowSize().toInt() && myConfig->readConfigInt("GameTableHeightSave") <= myGameTableStyle->getMaximumWindowHeight().toInt() && myConfig->readConfigInt("GameTableHeightSave") >= myGameTableStyle->getMinimumWindowHeight().toInt() && myConfig->readConfigInt("GameTableWidthSave") <= myGameTableStyle->getMaximumWindowWidth().toInt() && myConfig->readConfigInt("GameTableWidthSave") >= myGameTableStyle->getMinimumWindowWidth().toInt()) { if(!myGameTableStyle->getIfFixedWindowSize().toInt() && myConfig->readConfigInt("GameTableHeightSave") <= myGameTableStyle->getMaximumWindowHeight().toInt() && myConfig->readConfigInt("GameTableHeightSave") >= myGameTableStyle->getMinimumWindowHeight().toInt() && myConfig->readConfigInt("GameTableWidthSave") <= myGameTableStyle->getMaximumWindowWidth().toInt() && myConfig->readConfigInt("GameTableWidthSave") >= myGameTableStyle->getMinimumWindowWidth().toInt()) {
this->resize(myConfig->readConfigInt("GameTableWidthSave"), myConfig->readConfigInt("GameTableHeightSave")); this->resize(myConfig->readConfigInt("GameTableWidthSave"), myConfig->readConfigInt("GameTableHeightSave"));
} }
#endif
} }
#ifdef ANDROID #ifdef ANDROID
if(getAndroidApiVersion() == 10) { if(getAndroidApiVersion() == 10) {
@@ -4311,6 +4311,9 @@ void gameTableImpl::restoreGameTableGeometry()
this->showNormal(); this->showNormal();
this->setGeometry(0,0,availableWidth, availableHeight); this->setGeometry(0,0,availableWidth, availableHeight);
} }
else {
this->showFullScreen();
}
#endif #endif
} }