Commit 385affeb authored by Nikita Sirgienko's avatar Nikita Sirgienko
Browse files

[T12843][GSoC 2020] Disalbe highlighting updates for excluded from execution entries

parent 40bf7814
...@@ -830,7 +830,7 @@ bool CommandEntry::evaluate(EvaluationOption evalOp) ...@@ -830,7 +830,7 @@ bool CommandEntry::evaluate(EvaluationOption evalOp)
else else
{ {
evaluateNext(m_evaluationOption); evaluateNext(m_evaluationOption);
return false; return true;
} }
} }
...@@ -1409,7 +1409,7 @@ void CommandEntry::startRemoving() ...@@ -1409,7 +1409,7 @@ void CommandEntry::startRemoving()
WorksheetTextItem* CommandEntry::highlightItem() WorksheetTextItem* CommandEntry::highlightItem()
{ {
return m_commandItem; return m_isExecutionEnabled ? m_commandItem : nullptr;
} }
void CommandEntry::collapseResults() void CommandEntry::collapseResults()
...@@ -1495,6 +1495,8 @@ void CommandEntry::excludeFromExecution() ...@@ -1495,6 +1495,8 @@ void CommandEntry::excludeFromExecution()
m_activeExecutionBackgroundColor = m_commandItem->backgroundColor(); m_activeExecutionBackgroundColor = m_commandItem->backgroundColor();
m_activeExecutionTextColor = m_commandItem->defaultTextColor(); m_activeExecutionTextColor = m_commandItem->defaultTextColor();
disconnect(m_commandItem, &WorksheetTextItem::receivedFocus, worksheet(), &Worksheet::highlightItem);
m_commandItem->setBackgroundColor(scheme.background(KColorScheme::AlternateBackground).color()); m_commandItem->setBackgroundColor(scheme.background(KColorScheme::AlternateBackground).color());
m_commandItem->setDefaultTextColor(scheme.foreground(KColorScheme::InactiveText).color()); m_commandItem->setDefaultTextColor(scheme.foreground(KColorScheme::InactiveText).color());
} }
...@@ -1505,4 +1507,7 @@ void CommandEntry::addToExecution() ...@@ -1505,4 +1507,7 @@ void CommandEntry::addToExecution()
m_commandItem->setBackgroundColor(m_activeExecutionBackgroundColor); m_commandItem->setBackgroundColor(m_activeExecutionBackgroundColor);
m_commandItem->setDefaultTextColor(m_activeExecutionTextColor); m_commandItem->setDefaultTextColor(m_activeExecutionTextColor);
connect(m_commandItem, &WorksheetTextItem::receivedFocus, worksheet(), &Worksheet::highlightItem);
worksheet()->highlightItem(m_commandItem);
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment