mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-24 01:54:22 +00:00
Code Activity

Fixed a couple of bugs in TableListBox and FileListComponent.

Browse source
This commit is contained in:
Julian Storer 2010-06-19 20:49:03 +01:00
parent d975907a1e
commit 5d5aa37475
6 changed files with 28 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

32
juce_amalgamated.cpp
View file

@ -51028,7 +51028,7 @@ TableListBox::TableListBox (const String& name, TableListBoxModel* const model_)
TableListBox::~TableListBox()
{
deleteAllChildren();
header = 0;
}
void TableListBox::setModel (TableListBoxModel* const newModel)
@ -57924,7 +57924,6 @@ FileListComponent::FileListComponent (DirectoryContentsList& listToShow)
FileListComponent::~FileListComponent()
{
fileList.removeChangeListener (this);
deleteAllChildren();
}
int FileListComponent::getNumSelectedFiles() const
@ -73267,13 +73266,12 @@ public:
lastHue (0.0f),
edge (edgeSize)
{
addAndMakeVisible (marker = new ColourSpaceMarker());
addAndMakeVisible (&marker);
setMouseCursor (MouseCursor::CrosshairCursor);
}
~ColourSpaceView()
{
deleteAllChildren();
}
void paint (Graphics& g)
@ -73341,15 +73339,15 @@ private:
float& s;
float& v;
float lastHue;
ColourSpaceMarker* marker;
ColourSpaceMarker marker;
const int edge;
Image colours;
void updateMarker() const
void updateMarker()
{
marker->setBounds (roundToInt ((getWidth() - edge * 2) * s),
roundToInt ((getHeight() - edge * 2) * (1.0f - v)),
edge * 2, edge * 2);
marker.setBounds (roundToInt ((getWidth() - edge * 2) * s),
roundToInt ((getHeight() - edge * 2) * (1.0f - v)),
edge * 2, edge * 2);
}
ColourSpaceView (const ColourSpaceView&);
@ -73402,12 +73400,11 @@ public:
lastHue (0.0f),
edge (edgeSize)
{
addAndMakeVisible (marker = new HueSelectorMarker());
addAndMakeVisible (&marker);
}
~HueSelectorComp()
{
deleteAllChildren();
}
void paint (Graphics& g)
@ -73425,8 +73422,8 @@ public:
void resized()
{
marker->setBounds (0, roundToInt ((getHeight() - edge * 2) * h),
getWidth(), edge * 2);
marker.setBounds (0, roundToInt ((getHeight() - edge * 2) * h),
getWidth(), edge * 2);
}
void mouseDown (const MouseEvent& e)
@ -73452,7 +73449,7 @@ private:
float& s;
float& v;
float lastHue;
HueSelectorMarker* marker;
HueSelectorMarker marker;
const int edge;
HueSelectorComp (const HueSelectorComp&);
@ -73517,6 +73514,8 @@ ColourSelector::ColourSelector (const int flags_,
const int edgeGap_,
const int gapAroundColourSpaceComponent)
: colour (Colours::white),
colourSpace (0),
hueSelector (0),
flags (flags_),
topSpace (0),
edgeGap (edgeGap_)
@ -73548,11 +73547,6 @@ ColourSelector::ColourSelector (const int flags_,
addAndMakeVisible (colourSpace = new ColourSpaceView (this, h, s, v, gapAroundColourSpaceComponent));
addAndMakeVisible (hueSelector = new HueSelectorComp (this, h, s, v, gapAroundColourSpaceComponent));
}
else
{
colourSpace = 0;
hueSelector = 0;
}
update();
}

2
juce_amalgamated.h
View file

@ -64,7 +64,7 @@
*/
#define JUCE_MAJOR_VERSION 1
#define JUCE_MINOR_VERSION 52
#define JUCE_BUILDNUMBER 27
#define JUCE_BUILDNUMBER 28
/** Current Juce version number.

2
src/core/juce_StandardHeader.h
View file

@ -33,7 +33,7 @@
*/
#define JUCE_MAJOR_VERSION 1
#define JUCE_MINOR_VERSION 52
#define JUCE_BUILDNUMBER 27
#define JUCE_BUILDNUMBER 28
/** Current Juce version number.

2
src/gui/components/controls/juce_TableListBox.cpp
View file

@ -330,7 +330,7 @@ TableListBox::TableListBox (const String& name, TableListBoxModel* const model_)
TableListBox::~TableListBox()
{
deleteAllChildren();
header = 0;
}
void TableListBox::setModel (TableListBoxModel* const newModel)

1
src/gui/components/filebrowser/juce_FileListComponent.cpp
View file

@ -47,7 +47,6 @@ FileListComponent::FileListComponent (DirectoryContentsList& listToShow)
FileListComponent::~FileListComponent()
{
fileList.removeChangeListener (this);
deleteAllChildren();
}
int FileListComponent::getNumSelectedFiles() const

29
src/gui/components/special/juce_ColourSelector.cpp
View file

@ -101,13 +101,12 @@ public:
lastHue (0.0f),
edge (edgeSize)
{
addAndMakeVisible (marker = new ColourSpaceMarker());
addAndMakeVisible (&marker);
setMouseCursor (MouseCursor::CrosshairCursor);
}
~ColourSpaceView()
{
deleteAllChildren();
}
void paint (Graphics& g)
@ -175,15 +174,15 @@ private:
float& s;
float& v;
float lastHue;
ColourSpaceMarker* marker;
ColourSpaceMarker marker;
const int edge;
Image colours;
void updateMarker() const
void updateMarker()
{
marker->setBounds (roundToInt ((getWidth() - edge * 2) * s),
roundToInt ((getHeight() - edge * 2) * (1.0f - v)),
edge * 2, edge * 2);
marker.setBounds (roundToInt ((getWidth() - edge * 2) * s),
roundToInt ((getHeight() - edge * 2) * (1.0f - v)),
edge * 2, edge * 2);
}
ColourSpaceView (const ColourSpaceView&);
@ -238,12 +237,11 @@ public:
lastHue (0.0f),
edge (edgeSize)
{
addAndMakeVisible (marker = new HueSelectorMarker());
addAndMakeVisible (&marker);
}
~HueSelectorComp()
{
deleteAllChildren();
}
void paint (Graphics& g)
@ -261,8 +259,8 @@ public:
void resized()
{
marker->setBounds (0, roundToInt ((getHeight() - edge * 2) * h),
getWidth(), edge * 2);
marker.setBounds (0, roundToInt ((getHeight() - edge * 2) * h),
getWidth(), edge * 2);
}
void mouseDown (const MouseEvent& e)
@ -288,7 +286,7 @@ private:
float& s;
float& v;
float lastHue;
HueSelectorMarker* marker;
HueSelectorMarker marker;
const int edge;
HueSelectorComp (const HueSelectorComp&);
@ -355,6 +353,8 @@ ColourSelector::ColourSelector (const int flags_,
const int edgeGap_,
const int gapAroundColourSpaceComponent)
: colour (Colours::white),
colourSpace (0),
hueSelector (0),
flags (flags_),
topSpace (0),
edgeGap (edgeGap_)
@ -386,11 +386,6 @@ ColourSelector::ColourSelector (const int flags_,
addAndMakeVisible (colourSpace = new ColourSpaceView (this, h, s, v, gapAroundColourSpaceComponent));
addAndMakeVisible (hueSelector = new HueSelectorComp (this, h, s, v, gapAroundColourSpaceComponent));
}
else
{
colourSpace = 0;
hueSelector = 0;
}
update();
}