BColorControl: Awesome style fixes

This commit is contained in:
John Scipione
2016-03-12 19:10:58 -08:00
parent c5fe2948ba
commit 0e3b3f92ef
+22 -3
View File
@@ -269,7 +269,8 @@ BColorControl::SetValue(int32 value)
if (fPaletteMode) { if (fPaletteMode) {
//workaround when two indexes have the same color //workaround when two indexes have the same color
rgb_color c = BScreen(Window()).ColorForIndex(fSelectedPaletteColorIndex); rgb_color c
= BScreen(Window()).ColorForIndex(fSelectedPaletteColorIndex);
c.alpha = 255; c.alpha = 255;
if (fSelectedPaletteColorIndex == -1 || c != c2) { if (fSelectedPaletteColorIndex == -1 || c != c2) {
//here SetValue hasn't been called by mouse tracking //here SetValue hasn't been called by mouse tracking
@@ -341,7 +342,7 @@ BColorControl::AttachedToWindow()
fGreenText->SetTarget(this); fGreenText->SetTarget(this);
fBlueText->SetTarget(this); fBlueText->SetTarget(this);
if (fBitmap) if (fBitmap != NULL)
_InitOffscreen(); _InitOffscreen();
} }
@@ -491,7 +492,8 @@ BColorControl::_DrawSelectors(BView* target)
if (fPaletteMode) { if (fPaletteMode) {
if (fSelectedPaletteColorIndex != -1) { if (fSelectedPaletteColorIndex != -1) {
target->SetHighColor(lightenmax); target->SetHighColor(lightenmax);
target->StrokeRect(_PaletteSelectorFrame(fSelectedPaletteColorIndex)); target->StrokeRect(
_PaletteSelectorFrame(fSelectedPaletteColorIndex));
} }
} else { } else {
rgb_color color = ValueAsColor(); rgb_color color = ValueAsColor();
@@ -666,18 +668,22 @@ BColorControl::SetLayout(color_control_layout layout)
fColumns = 4; fColumns = 4;
fRows = 64; fRows = 64;
break; break;
case B_CELLS_8x32: case B_CELLS_8x32:
fColumns = 8; fColumns = 8;
fRows = 32; fRows = 32;
break; break;
case B_CELLS_16x16: case B_CELLS_16x16:
fColumns = 16; fColumns = 16;
fRows = 16; fRows = 16;
break; break;
case B_CELLS_32x8: case B_CELLS_32x8:
fColumns = 32; fColumns = 32;
fRows = 8; fRows = 8;
break; break;
case B_CELLS_64x4: case B_CELLS_64x4:
fColumns = 64; fColumns = 64;
fRows = 4; fRows = 4;
@@ -694,12 +700,16 @@ BColorControl::Layout() const
{ {
if (fColumns == 4 && fRows == 64) if (fColumns == 4 && fRows == 64)
return B_CELLS_4x64; return B_CELLS_4x64;
if (fColumns == 8 && fRows == 32) if (fColumns == 8 && fRows == 32)
return B_CELLS_8x32; return B_CELLS_8x32;
if (fColumns == 16 && fRows == 16) if (fColumns == 16 && fRows == 16)
return B_CELLS_16x16; return B_CELLS_16x16;
if (fColumns == 32 && fRows == 8) if (fColumns == 32 && fRows == 8)
return B_CELLS_32x8; return B_CELLS_32x8;
if (fColumns == 64 && fRows == 4) if (fColumns == 64 && fRows == 4)
return B_CELLS_64x4; return B_CELLS_64x4;
@@ -1029,22 +1039,27 @@ BColorControl::Perform(perform_code code, void* _data)
((perform_data_min_size*)_data)->return_value ((perform_data_min_size*)_data)->return_value
= BColorControl::MinSize(); = BColorControl::MinSize();
return B_OK; return B_OK;
case PERFORM_CODE_MAX_SIZE: case PERFORM_CODE_MAX_SIZE:
((perform_data_max_size*)_data)->return_value ((perform_data_max_size*)_data)->return_value
= BColorControl::MaxSize(); = BColorControl::MaxSize();
return B_OK; return B_OK;
case PERFORM_CODE_PREFERRED_SIZE: case PERFORM_CODE_PREFERRED_SIZE:
((perform_data_preferred_size*)_data)->return_value ((perform_data_preferred_size*)_data)->return_value
= BColorControl::PreferredSize(); = BColorControl::PreferredSize();
return B_OK; return B_OK;
case PERFORM_CODE_LAYOUT_ALIGNMENT: case PERFORM_CODE_LAYOUT_ALIGNMENT:
((perform_data_layout_alignment*)_data)->return_value ((perform_data_layout_alignment*)_data)->return_value
= BColorControl::LayoutAlignment(); = BColorControl::LayoutAlignment();
return B_OK; return B_OK;
case PERFORM_CODE_HAS_HEIGHT_FOR_WIDTH: case PERFORM_CODE_HAS_HEIGHT_FOR_WIDTH:
((perform_data_has_height_for_width*)_data)->return_value ((perform_data_has_height_for_width*)_data)->return_value
= BColorControl::HasHeightForWidth(); = BColorControl::HasHeightForWidth();
return B_OK; return B_OK;
case PERFORM_CODE_GET_HEIGHT_FOR_WIDTH: case PERFORM_CODE_GET_HEIGHT_FOR_WIDTH:
{ {
perform_data_get_height_for_width* data perform_data_get_height_for_width* data
@@ -1053,12 +1068,14 @@ BColorControl::Perform(perform_code code, void* _data)
&data->max, &data->preferred); &data->max, &data->preferred);
return B_OK; return B_OK;
} }
case PERFORM_CODE_SET_LAYOUT: case PERFORM_CODE_SET_LAYOUT:
{ {
perform_data_set_layout* data = (perform_data_set_layout*)_data; perform_data_set_layout* data = (perform_data_set_layout*)_data;
BColorControl::SetLayout(data->layout); BColorControl::SetLayout(data->layout);
return B_OK; return B_OK;
} }
case PERFORM_CODE_LAYOUT_INVALIDATED: case PERFORM_CODE_LAYOUT_INVALIDATED:
{ {
perform_data_layout_invalidated* data perform_data_layout_invalidated* data
@@ -1066,11 +1083,13 @@ BColorControl::Perform(perform_code code, void* _data)
BColorControl::LayoutInvalidated(data->descendants); BColorControl::LayoutInvalidated(data->descendants);
return B_OK; return B_OK;
} }
case PERFORM_CODE_DO_LAYOUT: case PERFORM_CODE_DO_LAYOUT:
{ {
BColorControl::DoLayout(); BColorControl::DoLayout();
return B_OK; return B_OK;
} }
case PERFORM_CODE_SET_ICON: case PERFORM_CODE_SET_ICON:
{ {
perform_data_set_icon* data = (perform_data_set_icon*)_data; perform_data_set_icon* data = (perform_data_set_icon*)_data;