Ticket #1701: colorControl9.diff

src/kits/interface/ColorControl.cpp

@@ -64 +64 @@
 BColorControl::_InitData(color_control_layout layout, float size,
     bool useOffscreen, BMessage* archive)
 {
+    fPaletteMode = false;
     fColumns = layout;
     fRows = 256 / fColumns;
     fCellSize = ceil(max_c(kMinCellSize, size));
@@ -156 +157 @@
 void
 BColorControl::_LayoutView()
 {
-    fPaletteFrame.Set(2.0f, 2.0f,
-        float(fColumns) * fCellSize + 2.0,
-        float(fRows) * fCellSize + 2.0 - 1.0);
-        //1 pixel adjust so that the inner space 
-        //has exactly rows*cellsize pixels in height
+    //TODO: set the layout after being attached to a window
+    //if (fPaletteMode){
+    //  fPaletteFrame.Set(2.0f, 2.0f,
+    //      float(fColumns) * fCellSize + 2.0,
+    //      float(fRows) * fCellSize + 2.0);
+    //} else {      
+        fPaletteFrame.Set(2.0f, 2.0f,
+            float(fColumns) * fCellSize + 2.0,
+            float(fRows) * fCellSize + 2.0 - 1.0);
+            //1 pixel adjust so that the inner space 
+            //has exactly rows*cellsize pixels in height
+    //}
     
     BRect rect = fPaletteFrame.InsetByCopy(-2.0,-2.0);  //bevel
     
@@ -551 +559 @@
 BRect
 BColorControl::_RampFrame(uint8 rampIndex) const
 {
-    float rampHeight = fPaletteFrame.Height() / 4;  
+    float rampHeight = float(fRows) * fCellSize / 4.0f; 
             
-    return BRect(fPaletteFrame.left,
+    return BRect( fPaletteFrame.left,
         fPaletteFrame.top + float(rampIndex) * rampHeight,
         fPaletteFrame.right,
         fPaletteFrame.top + float(rampIndex + 1) * rampHeight);

src/preferences/backgrounds/BackgroundsView.cpp

@@ -216 +216 @@
     rightbox->AddChild(fIconLabelOutline);
 
     rect.top += fIconLabelOutline->Bounds().Height() + 15;
-    fPicker = new BColorControl(BPoint(10, rect.top), B_CELLS_32x8, 5.0, "Picker",
+    fPicker = new BColorControl(BPoint(10, rect.top), B_CELLS_32x8, 7.0, "Picker",
         new BMessage(kMsgUpdateColor));
     rightbox->AddChild(fPicker);