LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1889 from andreituicu/fix_piano_drum_edit

Browse source 
fix #50846 : Pianoroll and Drumroll lose focus.
This commit is contained in:
Nicolas Froment 2015-03-16 14:35:47 +01:00
commit e13341589b
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mscore/scoreaccessibility.cpp
View file

@ -11,6 +11,8 @@
#include "playpanel.h"
#include "synthcontrol.h"
#include "mixer.h"
#include "drumroll.h"
#include "pianoroll.h"
namespace Ms{
@ -177,11 +179,14 @@ ScoreAccessibility* ScoreAccessibility::instance()
void ScoreAccessibility::updateAccessibilityInfo()
{
currentInfoChanged();
ScoreView* w = static_cast<MuseScore*>(mainWindow)->currentScoreView();
if (!w) return;
currentInfoChanged();
//getInspector->isAncestorOf is used so that inspector and search dialog don't loose focus
//when this method is called
//TODO: create a class to manage focus and replace this massive if
if ( (qApp->focusWidget() != w) &&
!mscore->inspector()->isAncestorOf(qApp->focusWidget()) &&
!(mscore->searchDialog() && mscore->searchDialog()->isAncestorOf(qApp->focusWidget())) &&
@ -189,7 +194,9 @@ void ScoreAccessibility::updateAccessibilityInfo()
!(mscore->getPlayPanel() && mscore->getPlayPanel()->isAncestorOf(qApp->focusWidget())) &&
!(mscore->getSynthControl() && mscore->getSynthControl()->isAncestorOf(qApp->focusWidget())) &&
!(mscore->getMixer() && mscore->getMixer()->isAncestorOf(qApp->focusWidget())) &&
!(mscore->searchDialog() && mscore->searchDialog()->isAncestorOf(qApp->focusWidget())) ) {
!(mscore->searchDialog() && mscore->searchDialog()->isAncestorOf(qApp->focusWidget())) &&
!(mscore->getDrumrollEditor() && mscore->getDrumrollEditor()->isAncestorOf(qApp->focusWidget())) &&
!(mscore->getPianorollEditor() && mscore->getPianorollEditor()->isAncestorOf(qApp->focusWidget()))) {
mscore->activateWindow();
w->setFocus();
}