Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 09:45:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Window.setFocus() unsetting focus if Interface has focus

Browse source
This commit is contained in:
David Rowe 2018-03-02 15:40:49 +13:00
parent d888e7fd95
commit 287ea8eff2
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/src/Application.cpp
View file

@ -7329,6 +7329,16 @@ bool Application::hasFocus() const {
return (QApplication::activeWindow() != nullptr);
}
void Application::setFocus() {
// Note: Windows doesn't allow a user focus to be taken away from another application. Instead, it changes the color of and
// flashes the taskbar icon.
auto window = qApp->getWindow();
window->activateWindow();
// Do NOT do the following because it takes focus away from the _displayPlugin.
//window->setFocus();
}
void Application::setMaxOctreePacketsPerSecond(int maxOctreePPS) {
if (maxOctreePPS != _maxOctreePPS) {
_maxOctreePPS = maxOctreePPS;

1
interface/src/Application.h
View file

@ -160,6 +160,7 @@ public:
QRect getRecommendedHUDRect() const;
glm::vec2 getDeviceSize() const;
bool hasFocus() const;
void setFocus();
void showCursor(const Cursor::Icon& cursor);

4
interface/src/scripting/WindowScriptingInterface.cpp
View file

@ -74,9 +74,7 @@ QScriptValue WindowScriptingInterface::hasFocus() {
void WindowScriptingInterface::setFocus() {
// It's forbidden to call focus() from another thread.
qApp->postLambdaEvent([] {
auto window = qApp->getWindow();
window->activateWindow();
window->setFocus();
qApp->setFocus();
});
}