mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-06 19:54:13 +02:00
Merge pull request #1331 from ispyisail/fix/1306-free-terminal-table
Fix the free terminal table staying empty after a move (#1306)
This commit is contained in:
@@ -205,6 +205,7 @@ void TerminalStripTreeDockWidget::on_m_tree_view_currentItemChanged(QTreeWidgetI
|
||||
Q_UNUSED(previous)
|
||||
|
||||
if (!current) {
|
||||
m_current_is_free_terminal = false;
|
||||
setCurrentStrip(nullptr);
|
||||
return;
|
||||
}
|
||||
@@ -225,11 +226,12 @@ void TerminalStripTreeDockWidget::on_m_tree_view_currentItemChanged(QTreeWidgetI
|
||||
}
|
||||
}
|
||||
|
||||
if (strip_ != m_current_strip) {
|
||||
setCurrentStrip(strip_);
|
||||
} else if (current_is_free != m_current_is_free_terminal) {
|
||||
//The flag must follow every selection change, or a reload of the tree
|
||||
//(e.g. after moving a free terminal) leaves it stale and the next
|
||||
//click on a free terminal shows nothing (#1306)
|
||||
if (strip_ != m_current_strip || current_is_free != m_current_is_free_terminal) {
|
||||
m_current_is_free_terminal = current_is_free;
|
||||
emit currentStripChanged(nullptr);
|
||||
setCurrentStrip(strip_);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user