luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed #144 (description of salt packages isn't shown) 

Plus: the text color of the description now uses the
palette and the color contrast better when the item
is selected.
This commit is contained in:
Matthias Koefferlein 2018-07-30 21:13:54 +02:00
parent 082a91cf15
commit a272cd3630
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog
View File

@ -11,6 +11,9 @@
Issue with RBA::QHostAddress (ambiguous overload) on Qt5 Issue with RBA::QHostAddress (ambiguous overload) on Qt5
* Bugfix: https://github.com/klayoutmatthias/klayout/issues/142 * Bugfix: https://github.com/klayoutmatthias/klayout/issues/142
Issue with RBA::RecursiveShapeIterator#region= Issue with RBA::RecursiveShapeIterator#region=
* Bugfix: https://github.com/klayoutmatthias/klayout/issues/144
The Salt package descriptions are not shown with Motif
style
* Bugfix: https://github.com/klayoutmatthias/klayout/issues/148 * Bugfix: https://github.com/klayoutmatthias/klayout/issues/148
Wrong font is used Wrong font is used
* Bugfix: 8 bit indexed GIF images can be used for package icons now * Bugfix: 8 bit indexed GIF images can be used for package icons now

19
src/lay/lay/laySaltModel.cc
View File

@ -47,8 +47,15 @@ SaltItemDelegate::paint (QPainter *painter, const QStyleOptionViewItem &option,
{ {
QStyleOptionViewItemV4 optionV4 = option; QStyleOptionViewItemV4 optionV4 = option;
initStyleOption (&optionV4, index); initStyleOption (&optionV4, index);
// let the text take all the available space (fixes #144)
optionV4.showDecorationSelected = true;
bool is_enabled = (optionV4.state & QStyle::State_Enabled); bool is_enabled = (optionV4.state & QStyle::State_Enabled);
if ((index.flags () & 0x10000) != 0) {
// the item wants to be drawn "disabled"
is_enabled = false;
}
optionV4.state |= QStyle::State_Enabled; optionV4.state |= QStyle::State_Enabled;
QStyle *style = optionV4.widget ? optionV4.widget->style () : QApplication::style (); QStyle *style = optionV4.widget ? optionV4.widget->style () : QApplication::style ();
@ -121,6 +128,11 @@ SaltModel::flags (const QModelIndex &index) const
f &= ~Qt::ItemIsEnabled; f &= ~Qt::ItemIsEnabled;
} }
if (g && (! is_enabled (g->name ()) || g->is_hidden ())) {
// We use a custom flag to indicate "disabled" display without actually disabling the item
f |= Qt::ItemFlags (0x10000);
}
return f; return f;
} }
@ -134,15 +146,9 @@ SaltModel::data (const QModelIndex &index, int role) const
return QVariant (tr ("<html><body><h4>There are no items to show in this list</h4><p>%1</p></body></html>").arg (m_empty_explanation)); return QVariant (tr ("<html><body><h4>There are no items to show in this list</h4><p>%1</p></body></html>").arg (m_empty_explanation));
} }
bool en = is_enabled (g->name ());
bool hidden = g->is_hidden (); bool hidden = g->is_hidden ();
std::string text = "<html><body>"; std::string text = "<html><body>";
if (! en || hidden) {
text += "<font color=\"#c0c0c0\">";
} else {
text += "<font color=\"#303030\">";
}
if (hidden) { if (hidden) {
text += "<i>"; text += "<i>";
} }
@ -179,7 +185,6 @@ SaltModel::data (const QModelIndex &index, int role) const
text += tl::to_string (tr ("This package is an auxiliary package for use with other packages.")); text += tl::to_string (tr ("This package is an auxiliary package for use with other packages."));
text += "</p></i>"; text += "</p></i>";
} }
text += "</font>";
text += "</body></html>"; text += "</body></html>";
return tl::to_qstring (text); return tl::to_qstring (text);