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

BColorControl: Create _SetCellSize() method

Browse Source 
...eliminating duplicated code.
This commit is contained in:
John Scipione 2013-05-31 00:43:15 -04:00
parent 0289f92063
commit 1186916f06
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,7 +102,8 @@ private:
uint8 shade) const;
BRect _PaletteSelectorFrame(uint8 colorIndex) const;
BRect _RampFrame(uint8 rampIndex) const;
void _SetCellSize(float size);
private:
BRect fPaletteFrame;
int16 fSelectedPaletteColorIndex;

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

@ -84,7 +84,8 @@ BColorControl::_InitData(color_control_layout layout, float size,
// so we take the main_screen colorspace at startup
fColumns = layout;
fRows = 256 / fColumns;
fCellSize = ceil(max_c(kMinCellSize, size));
_SetCellSize(size);
fSelectedPaletteColorIndex = -1;
fPreviousSelectedPaletteColorIndex = -1;
@ -611,6 +612,13 @@ BColorControl::_RampFrame(uint8 rampIndex) const
}
void
BColorControl::_SetCellSize(float size)
{
fCellSize = ceilf(max_c(kMinCellSize, size));
}
BRect
BColorControl::_PaletteSelectorFrame(uint8 colorIndex) const
{
@ -635,9 +643,9 @@ BColorControl::_InitOffscreen()
void
BColorControl::SetCellSize(float cellSide)
BColorControl::SetCellSize(float size)
{
fCellSize = ceil(max_c(kMinCellSize, cellSide));
_SetCellSize(size);
_LayoutView();
ResizeToPreferred();
}