mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-08 04:20:09 +00:00
Code Activity

Projucer: Fixed a potential crash in JucerTreeViewBase when dereferencing a deleted pointer to the underlying TreeViewItem

Browse source
This commit is contained in:
ed 2021-03-15 11:44:34 +00:00
parent d6ac6b543b
commit 94ac07cd73
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
extras/Projucer/Source/Utility/UI/jucer_JucerTreeViewBase.cpp
View file

@ -61,16 +61,12 @@ void TreePanelBase::saveOpenness()
}
//==============================================================================
JucerTreeViewBase::JucerTreeViewBase() : textX (0)
JucerTreeViewBase::JucerTreeViewBase()
{
setLinesDrawnForSubItems (false);
setDrawsInLeftMargin (true);
}
JucerTreeViewBase::~JucerTreeViewBase()
{
}
void JucerTreeViewBase::refreshSubItems()
{
WholeTreeOpennessRestorer wtor (*this);

19
extras/Projucer/Source/Utility/UI/jucer_JucerTreeViewBase.h
View file

@ -34,7 +34,7 @@ class JucerTreeViewBase : public TreeViewItem,
{
public:
JucerTreeViewBase();
~JucerTreeViewBase() override;
~JucerTreeViewBase() override = default;
int getItemWidth() const override { return -1; }
int getItemHeight() const override { return 25; }
@ -98,7 +98,7 @@ public:
}
};
int textX;
int textX = 0;
protected:
ProjectContentComponent* getProjectContentComponent() const;
@ -203,21 +203,24 @@ private:
class TreeItemComponent : public Component
{
public:
TreeItemComponent (JucerTreeViewBase& i) : item (i)
TreeItemComponent (JucerTreeViewBase& i) : item (&i)
{
setInterceptsMouseClicks (false, true);
item.textX = iconWidth;
item->textX = iconWidth;
}
void paint (Graphics& g) override
{
if (item == nullptr)
return;
auto bounds = getLocalBounds().toFloat();
auto iconBounds = bounds.removeFromLeft ((float) iconWidth).reduced (7, 5);
bounds.removeFromRight ((float) buttons.size() * bounds.getHeight());
item.paintIcon (g, iconBounds);
item.paintContent (g, bounds.toNearestInt());
item->paintIcon (g, iconBounds);
item->paintContent (g, bounds.toNearestInt());
}
void resized() override
@ -225,7 +228,7 @@ public:
auto r = getLocalBounds();
for (int i = buttons.size(); --i >= 0;)
buttons.getUnchecked(i)->setBounds (r.removeFromRight (r.getHeight()));
buttons.getUnchecked (i)->setBounds (r.removeFromRight (r.getHeight()));
}
void addRightHandButton (Component* button)
@ -234,7 +237,7 @@ public:
addAndMakeVisible (button);
}
JucerTreeViewBase& item;
WeakReference<JucerTreeViewBase> item;
OwnedArray<Component> buttons;
const int iconWidth = 25;