Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace use of QTreeWidget::setIcon and QTreeWidget::iconChanged with code that is compatible with our minimum suppported QT version

Browse Source
This commit is contained in:
Graham Dawes
2019-02-12 08:15:47 +00:00
parent 6ead20624a
commit 78280428e9
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/qt/treectrl.cpp
View File

@@ -140,8 +140,6 @@ public:
this, &wxQTreeWidget::OnItemExpanded); this, &wxQTreeWidget::OnItemExpanded);
connect(this, &QTreeWidget::itemChanged, connect(this, &QTreeWidget::itemChanged,
this, &wxQTreeWidget::OnItemChanged); this, &wxQTreeWidget::OnItemChanged);
connect(this, &QTreeWidget::iconSizeChanged,
this, &wxQTreeWidget::OnIconSizeChanged);
m_editorFactory.AttachTo(this); m_editorFactory.AttachTo(this);
setDragEnabled(true); setDragEnabled(true);
@@ -189,6 +187,13 @@ public:
return i->second.GetState(); return i->second.GetState();
} }
void ResizeIcons(const QSize &size)
{
m_placeHolderImage = QPixmap(size);
m_placeHolderImage.fill(Qt::transparent);
ReplaceIcons(invisibleRootItem());
}
QPixmap GetPlaceHolderImage() const QPixmap GetPlaceHolderImage() const
{ {
return m_placeHolderImage; return m_placeHolderImage;
@@ -217,6 +222,16 @@ protected:
} }
private: private:
void ReplaceIcons(QTreeWidgetItem *item)
{
item->setIcon(0, m_placeHolderImage);
const int childCount = item->childCount();
for ( int i = 0; i < childCount; ++i )
{
ReplaceIcons(item->child(i));
}
}
void OnCurrentItemChanged( void OnCurrentItemChanged(
QTreeWidgetItem *current, QTreeWidgetItem *current,
QTreeWidgetItem *previous QTreeWidgetItem *previous
@@ -341,12 +356,6 @@ private:
EmitEvent(event); EmitEvent(event);
} }
void OnIconSizeChanged(const QSize &size)
{
m_placeHolderImage = QPixmap(size);
m_placeHolderImage.fill(Qt::transparent);
}
void tryStartDrag(const QMouseEvent *event) void tryStartDrag(const QMouseEvent *event)
{ {
wxEventType command = event->buttons() & Qt::RightButton wxEventType command = event->buttons() & Qt::RightButton
@@ -513,7 +522,7 @@ void wxTreeCtrl::SetImageList(wxImageList *imageList)
int width, height; int width, height;
m_imageListNormal->GetSize(0, width, height); m_imageListNormal->GetSize(0, width, height);
m_qtTreeWidget->setIconSize(QSize(width, height)); m_qtTreeWidget->ResizeIcons(QSize(width, height));
m_qtTreeWidget->update(); m_qtTreeWidget->update();
} }