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

fix #30271

Browse source 
modified:   mscore/musescore.cpp
	modified:   mscore/musescore.h
	modified:   mscore/scoreaccessibility.cpp
This commit is contained in:
Andrei Tuicu 2014-08-27 22:38:00 +03:00
parent 54f4fc3acf
commit 92a7750d49
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mscore/musescore.cpp
View file

@ -4375,6 +4375,15 @@ Navigator* MuseScore::navigator() const
return _navigator ? static_cast<Navigator*>(_navigator->widget()) : 0;
}
//---------------------------------------------------------
// getSearchDialog
//---------------------------------------------------------
QWidget* MuseScore::getSearchDialog() const
{
return searchDialog;
}
//---------------------------------------------------------
// updateLayer
//---------------------------------------------------------

1
mscore/musescore.h
View file

@ -611,6 +611,7 @@ class MuseScore : public QMainWindow, public MuseScoreCore {
Q_INVOKABLE QString getLocaleISOCode() const;
Navigator* navigator() const;
NScrollArea* navigatorScrollArea() const { return _navigator; }
QWidget* getSearchDialog() const;
void updateLayer();
void updatePlayMode();
bool loop() const { return loopAction->isChecked(); }

6
mscore/scoreaccessibility.cpp
View file

@ -175,9 +175,11 @@ void ScoreAccessibility::updateAccessibilityInfo()
currentInfoChanged();
ScoreView* w = static_cast<MuseScore*>(mainWindow)->currentScoreView();
//getInspector->isAncestorOf is used so that inspector doesn't lose focus
//getInspector->isAncestorOf is used so that inspector and search dialog don't loose focus
//when this method is called
if ( (qApp->focusWidget() != w) && !mscore->getInspector()->isAncestorOf(qApp->focusWidget())) {
if ( (qApp->focusWidget() != w) &&
!mscore->getInspector()->isAncestorOf(qApp->focusWidget()) &&
(mscore->getSearchDialog() && !mscore->getSearchDialog()->isAncestorOf(qApp->focusWidget()))) {
w->setFocus();
}
QObject* obj = static_cast<QObject*>(w);