diff options
| author | Lukas Holecek <hluk@email.cz> | 2014-12-01 17:43:20 +0100 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2014-12-02 08:25:44 +0100 |
| commit | b0afe9142fe8472202f4d0e574c2a48f7d6abe04 (patch) | |
| tree | a54fdbb7aa4b3a630b7b34c6df783c9a0a097c5f | |
| parent | 99e2c9dbd4d98b1c66d1c62b2a0b06ea58aced2a (diff) | |
| download | qt-creator-b0afe9142fe8472202f4d0e574c2a48f7d6abe04.tar.gz | |
FakeVim: Relative numbering is enabled only in FakeVim mode
Task-number: QTCREATORBUG-11750
Change-Id: I1cfe9c078dcb0098b4894c848af0065aab505779
Reviewed-by: hjk <hjk121@nokiamail.com>
| -rw-r--r-- | src/plugins/fakevim/fakevimplugin.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index 442a3ea554..79fdada392 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -1279,6 +1279,8 @@ void FakeVimPluginPrivate::createRelativeNumberWidget(IEditor *editor) RelativeNumbersColumn *relativeNumbers = new RelativeNumbersColumn(textEditor); connect(theFakeVimSetting(ConfigRelativeNumber), SIGNAL(valueChanged(QVariant)), relativeNumbers, SLOT(deleteLater())); + connect(theFakeVimSetting(ConfigUseFakeVim), SIGNAL(valueChanged(QVariant)), + relativeNumbers, SLOT(deleteLater())); relativeNumbers->show(); } } @@ -1815,10 +1817,10 @@ void FakeVimPluginPrivate::editorOpened(IEditor *editor) if (theFakeVimSetting(ConfigUseFakeVim)->value().toBool()) { resetCommandBuffer(); handler->setupWidget(); - } - if (theFakeVimSetting(ConfigRelativeNumber)->value().toBool()) - createRelativeNumberWidget(editor); + if (theFakeVimSetting(ConfigRelativeNumber)->value().toBool()) + createRelativeNumberWidget(editor); + } } void FakeVimPluginPrivate::editorAboutToClose(IEditor *editor) @@ -1854,6 +1856,7 @@ void FakeVimPluginPrivate::setUseFakeVim(const QVariant &value) if (Core::FindPlugin::instance()) Core::FindPlugin::instance()->setUseFakeVim(on); setUseFakeVimInternal(on); + setShowRelativeLineNumbers(theFakeVimSetting(ConfigRelativeNumber)->value()); } void FakeVimPluginPrivate::setUseFakeVimInternal(bool on) @@ -1931,7 +1934,7 @@ void FakeVimPluginPrivate::hasBlockSelection(bool *on) void FakeVimPluginPrivate::setShowRelativeLineNumbers(const QVariant &value) { - if (value.toBool()) { + if (value.toBool() && theFakeVimSetting(ConfigUseFakeVim)->value().toBool()) { foreach (IEditor *editor, m_editorToHandler.keys()) createRelativeNumberWidget(editor); } |