diff options
author | Eike Ziller <eike.ziller@qt.io> | 2019-06-18 11:48:32 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2019-06-18 11:48:32 +0200 |
commit | b02f4ae6154810a9894615eca3052957e6e3ec56 (patch) | |
tree | 4569646cf3882d862a4784d9a278a55b373a106e /src/plugins/coreplugin | |
parent | 174b6f7e659f6667ea8621f2d57d3bf67fedcdbf (diff) | |
parent | a2cfa434683552f63699a70e9de2295a12f41eaa (diff) | |
download | qt-creator-b02f4ae6154810a9894615eca3052957e6e3ec56.tar.gz |
Merge remote-tracking branch 'origin/4.9' into 4.10
Change-Id: I6f1bc9381dc8c0ce8abc5a6c006087076d8fc1bc
Diffstat (limited to 'src/plugins/coreplugin')
-rw-r--r-- | src/plugins/coreplugin/dialogs/shortcutsettings.cpp | 2 | ||||
-rw-r--r-- | src/plugins/coreplugin/editortoolbar.cpp | 15 | ||||
-rw-r--r-- | src/plugins/coreplugin/editortoolbar.h | 1 |
3 files changed, 5 insertions, 13 deletions
diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp index 77fb5c96ea..d740b6ca20 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp @@ -552,7 +552,7 @@ bool ShortcutSettingsWidget::markCollisions(ShortcutItem *item) } item->m_item->setForeground(2, hasCollision ? Utils::creatorTheme()->color(Utils::Theme::TextColorError) - : commandList()->palette().window()); + : commandList()->palette().windowText()); return hasCollision; } diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp index 9f28c33f6d..9d19415e45 100644 --- a/src/plugins/coreplugin/editortoolbar.cpp +++ b/src/plugins/coreplugin/editortoolbar.cpp @@ -295,8 +295,10 @@ void EditorToolBar::setToolbarCreationFlags(ToolbarCreationFlags flags) { d->m_isStandalone = flags & FlagsStandalone; if (d->m_isStandalone) { - connect(EditorManager::instance(), &EditorManager::currentEditorChanged, - this, &EditorToolBar::updateEditorListSelection); + connect(EditorManager::instance(), + &EditorManager::currentEditorChanged, + this, + &EditorToolBar::setCurrentEditor); disconnect(d->m_editorList, QOverload<int>::of(&QComboBox::activated), this, &EditorToolBar::listSelectionActivated); @@ -327,15 +329,6 @@ void EditorToolBar::setCurrentEditor(IEditor *editor) updateDocumentStatus(document); } -void EditorToolBar::updateEditorListSelection(IEditor *newSelection) -{ - if (newSelection) { - const Utils::optional<int> index = DocumentModel::rowOfDocument(newSelection->document()); - if (QTC_GUARD(index)) - d->m_editorList->setCurrentIndex(index.value()); - } -} - void EditorToolBar::changeActiveEditor(int row) { EditorManager::activateEditorForEntry(DocumentModel::entryAtRow(row)); diff --git a/src/plugins/coreplugin/editortoolbar.h b/src/plugins/coreplugin/editortoolbar.h index b8d7fad468..0d82e58303 100644 --- a/src/plugins/coreplugin/editortoolbar.h +++ b/src/plugins/coreplugin/editortoolbar.h @@ -105,7 +105,6 @@ private: void updateActionShortcuts(); void updateDocumentStatus(IDocument *document); - void updateEditorListSelection(IEditor *newSelection); void fillListContextMenu(QMenu *menu); void updateToolBar(QWidget *toolBar); |