VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-21 23:55:13 -05:00
Code Issues Projects Releases Wiki Activity

Fix for Android Qt6

Browse Source
This commit is contained in:
Jon Beniston 2024-10-21 17:05:19 +01:00
parent de37c031b5
commit b6146caf36
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sdrbase/util/android.cpp
View File

@ -95,6 +95,38 @@ void Android::moveTaskToBack()
} }
} }
void Android::acquireWakeLock()
{
QJniObject activity = QJniObject::callStaticObjectMethod("org/qtproject/qt5/android/QtNative", "activity", "()Landroid/app/Activity;");
if (activity.isValid()) {
activity.callMethod<void>("acquireWakeLock");
}
}
void Android::releaseWakeLock()
{
QJniObject activity = QJniObject::callStaticObjectMethod("org/qtproject/qt5/android/QtNative", "activity", "()Landroid/app/Activity;");
if (activity.isValid()) {
activity.callMethod<void>("releaseWakeLock");
}
}
void Android::acquireScreenLock()
{
QJniObject activity = QJniObject::callStaticObjectMethod("org/qtproject/qt5/android/QtNative", "activity", "()Landroid/app/Activity;");
if (activity.isValid()) {
activity.callMethod<void>("acquireScreenLock");
}
}
void Android::releaseScreenLock()
{
QJniObject activity = QJniObject::callStaticObjectMethod("org/qtproject/qt5/android/QtNative", "activity", "()Landroid/app/Activity;");
if (activity.isValid()) {
activity.callMethod<void>("releaseScreenLock");
}
}
#else // QT_VERSION #else // QT_VERSION
#include <QtAndroid> #include <QtAndroid>

2
sdrgui/mainwindow.cpp
View File

@ -1143,7 +1143,7 @@ void LoadConfigurationFSM::restoreGeometry()
m_mainWindow->m_workspaces[i]->adjustSubWindowsAfterRestore(); m_mainWindow->m_workspaces[i]->adjustSubWindowsAfterRestore();
#ifdef ANDROID #ifdef ANDROID
// On Android, workspaces seem to be restored to 0,20, rather than 0,0 // On Android, workspaces seem to be restored to 0,20, rather than 0,0
m_mainWindow->m_workspaces[i]->move(m_workspaces[i]->pos().x(), 0); m_mainWindow->m_workspaces[i]->move(m_mainWindow->m_workspaces[i]->pos().x(), 0);
// Need to call updateGeometry, otherwise sometimes the layout is corrupted // Need to call updateGeometry, otherwise sometimes the layout is corrupted
m_mainWindow->m_workspaces[i]->updateGeometry(); m_mainWindow->m_workspaces[i]->updateGeometry();
#endif #endif