From 42fbe7b30a4bba1e02e7686d65f7859c46880ced Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Mon, 28 Feb 2022 21:19:03 +0100 Subject: [PATCH] Avoid clipped texts in netlist/LVS result browser, text as tool tips --- src/laybasic/laybasic/layItemDelegates.cc | 2 +- src/laybasic/laybasic/layNetlistBrowserModel.cc | 8 ++++++-- src/laybasic/laybasic/layNetlistBrowserPage.cc | 6 ++++++ src/laybasic/laybasic/layNetlistBrowserTreeModel.cc | 8 ++++++-- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/laybasic/laybasic/layItemDelegates.cc b/src/laybasic/laybasic/layItemDelegates.cc index 0c7ccc6e4..6d3e230c6 100644 --- a/src/laybasic/laybasic/layItemDelegates.cc +++ b/src/laybasic/laybasic/layItemDelegates.cc @@ -40,7 +40,7 @@ HTMLItemDelegate::HTMLItemDelegate (QObject *parent) m_icon_spacing = 6; m_text_margin = 4; m_text_height = -1; - m_text_width = 500; + m_text_width = -1; m_plain_text = false; m_anchors_clickable = false; } diff --git a/src/laybasic/laybasic/layNetlistBrowserModel.cc b/src/laybasic/laybasic/layNetlistBrowserModel.cc index c7702d261..61126be03 100644 --- a/src/laybasic/laybasic/layNetlistBrowserModel.cc +++ b/src/laybasic/laybasic/layNetlistBrowserModel.cc @@ -2566,8 +2566,12 @@ NetlistBrowserModel::data (const QModelIndex &index, int role) const return QVariant (icon_for_status (status (index))); } else if (role == Qt::DisplayRole) { return QVariant (text (index)); - } else if (role == Qt::ToolTipRole && index.column () == m_status_column) { - return tooltip (index); + } else if (role == Qt::ToolTipRole) { + if (index.column () == m_status_column) { + return tooltip (index); + } else { + return QVariant (text (index)); + } } else if (role == Qt::UserRole) { return QVariant (search_text (index)); } else if (role == Qt::FontRole) { diff --git a/src/laybasic/laybasic/layNetlistBrowserPage.cc b/src/laybasic/laybasic/layNetlistBrowserPage.cc index f69b537d7..17db0cfb9 100644 --- a/src/laybasic/laybasic/layNetlistBrowserPage.cc +++ b/src/laybasic/laybasic/layNetlistBrowserPage.cc @@ -168,16 +168,22 @@ NetlistBrowserPage::NetlistBrowserPage (QWidget * /*parent*/) for (int i = 0; i < 4; ++i) { delegate = new lay::HTMLItemDelegate (this); delegate->set_text_margin (2); + delegate->set_plain_text (true); + /* currently, HTML is not used: delegate->set_anchors_clickable (true); connect (delegate, SIGNAL (anchor_clicked (const QString &)), this, SLOT (anchor_clicked (const QString &))); + */ directory_tree->setItemDelegateForColumn (i, delegate); } for (int i = 0; i < 2; ++i) { delegate = new lay::HTMLItemDelegate (this); delegate->set_text_margin (2); + delegate->set_plain_text (true); + /* currently, HTML is not used: delegate->set_anchors_clickable (true); connect (delegate, SIGNAL (anchor_clicked (const QString &)), this, SLOT (anchor_clicked (const QString &))); + */ hierarchy_tree->setItemDelegateForColumn (i, delegate); } diff --git a/src/laybasic/laybasic/layNetlistBrowserTreeModel.cc b/src/laybasic/laybasic/layNetlistBrowserTreeModel.cc index 5d93d2cc1..c88954df6 100644 --- a/src/laybasic/laybasic/layNetlistBrowserTreeModel.cc +++ b/src/laybasic/laybasic/layNetlistBrowserTreeModel.cc @@ -164,8 +164,12 @@ NetlistBrowserTreeModel::data (const QModelIndex &index, int role) const return QVariant (icon_for_status (status (index))); } else if (role == Qt::DisplayRole) { return QVariant (text (index)); - } else if (role == Qt::ToolTipRole && index.column () == m_status_column) { - return tooltip (index); + } else if (role == Qt::ToolTipRole) { + if (index.column () == m_status_column) { + return tooltip (index); + } else { + return QVariant (text (index)); + } } else if (role == Qt::UserRole) { return QVariant (search_text (index)); } else if (role == Qt::FontRole) {