feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix context of Locator input

Browse Source 
- In the main window, the locator input (actually the status bar)
  visually feels like being part of the mode widget, so give
  it its context.
- In extra editor windows, the whole editor window should have
  "editor manager" context, so that is also active for the locator
  input.

Task-number: QTCREATORBUG-20626
Task-number: QTCREATORBUG-20071
Change-Id: Ib68d6a8177446572ea59c3cc057eca0706173e11
Reviewed-by: Xing Xiong
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2018-07-10 15:49:50 +02:00
parent 735aeb3e38
commit 8fa449126c
13 changed files with 66 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/coreplugin/modemanager.cpp
View File

@@ -125,7 +125,7 @@ ModeManager::~ModeManager()
m_instance = nullptr;
}
Id ModeManager::currentMode()
Id ModeManager::currentModeId()
{
int currentIndex = d->m_modeStack->currentIndex();
if (currentIndex < 0)
@@ -222,7 +222,7 @@ void ModeManagerPrivate::enabledStateChanged(IMode *mode)
d->m_modeStack->setTabEnabled(index, mode->isEnabled());
// Make sure we leave any disabled mode to prevent possible crashes:
if (mode->id() == ModeManager::currentMode() && !mode->isEnabled()) {
if (mode->id() == ModeManager::currentModeId() && !mode->isEnabled()) {
// This assumes that there is always at least one enabled mode.
for (int i = 0; i < d->m_modes.count(); ++i) {
if (d->m_modes.at(i) != mode &&
@@ -298,7 +298,7 @@ void ModeManager::currentTabChanged(int index)
void ModeManager::setFocusToCurrentMode()
{
IMode *mode = findMode(currentMode());
IMode *mode = findMode(currentModeId());
QTC_ASSERT(mode, return);
QWidget *widget = mode->widget();
if (widget) {
@@ -336,4 +336,10 @@ ModeManager *ModeManager::instance()
return m_instance;
}
IMode *ModeManager::currentMode()
{
const int currentIndex = d->m_modeStack->currentIndex();
return currentIndex < 0 ? nullptr : d->m_modes.at(currentIndex);
}
} // namespace Core