AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: Initialize mWindowState

Browse Source 
Use the same variable in QAndroidPlatformWindow.

Task-number: QTBUG-34764

Change-Id: Idf33707e81cf7306663196f3c17735d8dc1dde5d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
This commit is contained in:
BogDan Vatra 2013-11-12 10:45:26 +02:00 committed by The Qt Project
parent bcf5dbc8a0
commit 2828072d50
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platformsupport/fbconvenience/qfbwindow.cpp
View File

@ -48,7 +48,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QFbWindow::QFbWindow(QWindow *window) QFbWindow::QFbWindow(QWindow *window)
: QPlatformWindow(window), mBackingStore(0) : QPlatformWindow(window), mBackingStore(0), mWindowState(Qt::WindowNoState)
{ {
static QAtomicInt winIdGenerator(1); static QAtomicInt winIdGenerator(1);
mWindowId = winIdGenerator.fetchAndAddRelaxed(1); mWindowId = winIdGenerator.fetchAndAddRelaxed(1);

8
src/plugins/platforms/android/src/raster/qandroidplatformwindow.cpp
View File

@ -46,7 +46,6 @@
QAndroidPlatformWindow::QAndroidPlatformWindow(QWindow *window) QAndroidPlatformWindow::QAndroidPlatformWindow(QWindow *window)
: QFbWindow(window) : QFbWindow(window)
, m_state(Qt::WindowNoState)
{ {
} }
@ -65,9 +64,9 @@ void QAndroidPlatformWindow::updateStatusBarVisibility()
Qt::WindowFlags flags = window()->flags(); Qt::WindowFlags flags = window()->flags();
bool isNonRegularWindow = flags & (Qt::Popup | Qt::Dialog | Qt::Sheet) & ~Qt::Window; bool isNonRegularWindow = flags & (Qt::Popup | Qt::Dialog | Qt::Sheet) & ~Qt::Window;
if (!isNonRegularWindow) { if (!isNonRegularWindow) {
if (m_state & Qt::WindowFullScreen) if (mWindowState & Qt::WindowFullScreen)
QtAndroid::hideStatusBar(); QtAndroid::hideStatusBar();
else if (m_state & Qt::WindowMaximized) else if (mWindowState & Qt::WindowMaximized)
QtAndroid::showStatusBar(); QtAndroid::showStatusBar();
} }
} }
@ -80,10 +79,9 @@ void QAndroidPlatformWindow::raise()
void QAndroidPlatformWindow::setWindowState(Qt::WindowState state) void QAndroidPlatformWindow::setWindowState(Qt::WindowState state)
{ {
if (m_state == state) if (mWindowState == state)
return; return;
m_state = state;
if (window()->isVisible()) if (window()->isVisible())
updateStatusBarVisibility(); updateStatusBarVisibility();

3
src/plugins/platforms/android/src/raster/qandroidplatformwindow.h
View File

@ -59,9 +59,6 @@ public:
public slots: public slots:
void setGeometry(const QRect &rect); void setGeometry(const QRect &rect);
private:
Qt::WindowState m_state;
}; };
#endif // ANDROIDPLATFORMWINDOW_H #endif // ANDROIDPLATFORMWINDOW_H