kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-09-28 13:24:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adapt only element icons in the shortcut bar editor, not its commands

Browse Source 
The editor's bar row and command list mix element previews with command
icons. The command icons already follow the palette through the qet-dark
icon theme, and running them through ElementPreviewDelegate again
flattened them to one lightness (up to 16/255 per pixel off master; a
two-tone icon would have had its tones swapped).

Adapt the element icons once, where the items are built, instead of
installing the delegate on those lists. This also covers an element
dragged from the element list onto the bar, which copies the item's icon
and so previously kept the dark one until the editor was reopened.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
ispyisail
2026-09-28 11:53:13 +13:00
parent c7f4a4f01d
commit 9b09469a53
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/ElementsCollection/elementpickerpopup.cpp
+23 -8
View File
@@ -55,6 +55,25 @@
//slow and the grid unusable.
static const int max_palette_entries = 60;
/**
@brief elementIcon
@return the element preview @a icon, adapted to @a widget's palette at
@a size. The shortcut bar and its editor mix these with command icons,
which already follow the palette through the icon theme, so the
element icons are adapted once here rather than by an
ElementPreviewDelegate over the whole list. An item dragged from one
list to another keeps its adapted icon.
*/
static QIcon elementIcon(const QIcon &icon, const QSize &size, const QWidget *widget)
{
if (icon.isNull() || !QET::Palette::isDark(widget->palette())) {
return icon;
}
return QIcon(QET::Palette::forPalette(
icon.pixmap(size, widget->devicePixelRatio()),
widget->palette()));
}
/**
@brief ElementPickerPopup::ElementPickerPopup
@param source : the collection widget whose model the search runs against
@@ -107,7 +126,6 @@ ElementPickerPopup::ElementPickerPopup(ElementsCollectionWidget *source,
m_edit_available->setIconSize(QSize(20, 20));
m_edit_available->setMinimumHeight(220);
for (QListWidget *list : {m_edit_row, m_edit_available}) {
list->setItemDelegate(new ElementPreviewDelegate(list));
list->setDragDropMode(QAbstractItemView::DragDrop);
list->setDefaultDropAction(Qt::MoveAction);
list->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -169,7 +187,6 @@ ElementPickerPopup::ElementPickerPopup(ElementsCollectionWidget *source,
m_edit_symbols_search->setClearButtonEnabled(true);
m_edit_symbols = new QListWidget(m_edit_symbols_box);
m_edit_symbols->setIconSize(QSize(32, 32));
m_edit_symbols->setItemDelegate(new ElementPreviewDelegate(m_edit_symbols));
m_edit_symbols->setMinimumHeight(220);
m_edit_symbols->setDragDropMode(QAbstractItemView::DragOnly);
m_edit_symbols->setDefaultDropAction(Qt::CopyAction);
@@ -384,10 +401,7 @@ void ElementPickerPopup::setCommands(const QStringList &ids)
auto *button = new QToolButton(m_commands);
button->setAutoRaise(true);
button->setIconSize(QSize(24, 24));
//No item delegate on a button: adapt the preview here
button->setIcon(QIcon(QET::Palette::forPalette(
location.icon().pixmap(QSize(24, 24), devicePixelRatio()),
palette())));
button->setIcon(elementIcon(location.icon(), QSize(24, 24), this));
button->setToolTip(location.name());
button->setFocusPolicy(Qt::NoFocus);
connect(button, &QToolButton::clicked, this, [this, location]() {
@@ -551,7 +565,7 @@ QListWidgetItem *ElementPickerPopup::barItem(const QString &id, bool icon_only)
const ElementsLocation location(id);
if (location.exist()) {
text = location.name();
icon = location.icon();
icon = elementIcon(location.icon(), QSize(24, 24), this);
}
} else if (QAction *action = commandAction(id)) {
text = action->text().remove(QLatin1Char('&'));
@@ -641,7 +655,8 @@ void ElementPickerPopup::runSymbolSearch()
if (ElementsLocation(hit.path).isProject()) {
continue;
}
auto *item = new QListWidgetItem(hit.icon, hit.name);
auto *item = new QListWidgetItem(
elementIcon(hit.icon, m_edit_symbols->iconSize(), this), hit.name);
item->setData(Qt::UserRole, hit.path);
item->setToolTip(QStringLiteral("%1\n%2").arg(hit.name, hit.folder));
m_edit_symbols->addItem(item);