Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BColorControl: Remove fOffscreenView pointer

Browse Source 
...and rename fBitmap to fOffscreenBitmap to make it more clear what it is.

We don't need to save a pointer to both the offscreen bitmap and
the offscreen view, just the bitmap. We can access the view by calling
fOffscreenBitmap->ChildAt((int32)0). This gives us back a _reserved private
variable slot.

In the (unlikely) case that _InitData() is called with offscreen = false but
the fOffscreenBitmap is not NULL, delete fOffscreenBitmap before
setting it to NULL so that memory is not leaked.
This commit is contained in:
John Scipione 2016-03-12 17:20:02 -08:00
parent 76b9d53bd0
commit 53f75ce5d6
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
headers/os/interface/ColorControl.h
View File

@ -125,12 +125,11 @@ private:
BTextControl* fGreenText;
BTextControl* fBlueText;
BBitmap* fBitmap;
BView* fOffscreenView;
BBitmap* fOffscreenBitmap;
int16 fFocusedRamp;
int16 fClickedRamp;
uint32 _reserved[2];
uint32 _reserved[3];
};
inline void

45
src/kits/interface/ColorControl.cpp
View File

@ -56,8 +56,7 @@ BColorControl::BColorControl(BPoint leftTop, color_control_layout layout,
fRedText(NULL),
fGreenText(NULL),
fBlueText(NULL),
fBitmap(NULL),
fOffscreenView(NULL)
fOffscreenBitmap(NULL)
{
_InitData(layout, cellSize, useOffscreen, NULL);
}
@ -69,8 +68,7 @@ BColorControl::BColorControl(BMessage* data)
fRedText(NULL),
fGreenText(NULL),
fBlueText(NULL),
fBitmap(NULL),
fOffscreenView(NULL)
fOffscreenBitmap(NULL)
{
int32 layout;
float cellSize;
@ -86,7 +84,7 @@ BColorControl::BColorControl(BMessage* data)
BColorControl::~BColorControl()
{
delete fBitmap;
delete fOffscreenBitmap;
}
@ -184,18 +182,18 @@ BColorControl::_InitData(color_control_layout layout, float size,
ResizeToPreferred();
if (useOffscreen) {
if (fOffscreenView != NULL) {
if (fOffscreenBitmap != NULL) {
BRect bounds = _PaletteFrame();
fBitmap = new BBitmap(bounds, B_RGB32, true, false);
fOffscreenView = new BView(bounds, "off_view", 0, 0);
fOffscreenBitmap = new BBitmap(bounds, B_RGB32, true, false);
BView* offscreenView = new BView(bounds, "off_view", 0, 0);
fBitmap->Lock();
fBitmap->AddChild(fOffscreenView);
fBitmap->Unlock();
fOffscreenBitmap->Lock();
fOffscreenBitmap->AddChild(offscreenView);
fOffscreenBitmap->Unlock();
}
} else {
fBitmap = NULL;
fOffscreenView = NULL;
delete fOffscreenBitmap;
fOffscreenBitmap = NULL;
}
}
@ -254,7 +252,7 @@ BColorControl::Archive(BMessage* data, bool deep) const
status = data->AddFloat("_csize", fCellSize);
if (status == B_OK)
status = data->AddBool("_use_off", fOffscreenView != NULL);
status = data->AddBool("_use_off", fOffscreenBitmap != NULL);
return status;
}
@ -354,7 +352,7 @@ BColorControl::AttachedToWindow()
fGreenText->SetTarget(this);
fBlueText->SetTarget(this);
if (fBitmap != NULL)
if (fOffscreenBitmap != NULL)
_InitOffscreen();
}
@ -393,7 +391,7 @@ BColorControl::MessageReceived(BMessage* message)
data->AddInt32("_val", Value());
// reinititialize
bool useOffscreen = fOffscreenView != NULL;
bool useOffscreen = fOffscreenBitmap != NULL;
_InitData((color_control_layout)fColumns, fCellSize,
useOffscreen, data);
if (useOffscreen)
@ -414,8 +412,8 @@ BColorControl::MessageReceived(BMessage* message)
void
BColorControl::Draw(BRect updateRect)
{
if (fBitmap != NULL)
DrawBitmap(fBitmap, B_ORIGIN);
if (fOffscreenBitmap != NULL)
DrawBitmap(fOffscreenBitmap, B_ORIGIN);
else
_DrawColorArea(this, updateRect);
@ -657,10 +655,13 @@ BColorControl::_PaletteSelectorFrame(uint8 colorIndex) const
void
BColorControl::_InitOffscreen()
{
if (fBitmap->Lock()) {
_DrawColorArea(fOffscreenView, _PaletteFrame());
fOffscreenView->Sync();
fBitmap->Unlock();
if (fOffscreenBitmap->Lock()) {
BView* offscreenView = fOffscreenBitmap->ChildAt((int32)0);
if (offscreenView != NULL) {
_DrawColorArea(offscreenView, _PaletteFrame());
offscreenView->Sync();
}
fOffscreenBitmap->Unlock();
}
}