Color picker fixes... (bug #1490)

Since color is stored RGB only in Blender, the conversion from and to HSV
causes values to be clipped all the time.
Solution found is adding a persistant hsv storage to the uiBut struct, and
have it working on that only while hsv button is open. Still, after usage
(leaving picker) the conversion will change values to rgb.

Also added; redraw event for editing buttons, to show correct changed
color while using nkey picker

6 files changed, 80 insertions, 69 deletions

diff --git a/source/blender/include/BIF_interface.h b/source/blender/include/BIF_interface.h
index 01fc74430e1..e374cb3571e 100644
--- a/source/blender/include/BIF_interface.h
+++ b/source/blender/include/BIF_interface.h
@@ -180,7 +180,7 @@ void uiFreeBlocksWin(struct ListBase *lb, int win);
 uiBlock *uiNewBlock(struct ListBase *lb, char *name, short dt, short font, short win);
 uiBlock *uiGetBlock(char *name, struct ScrArea *sa);
 
-void uiBlockPickerButtons(struct uiBlock *block, float *col, float *hsv, float *old, char mode);
+void uiBlockPickerButtons(struct uiBlock *block, float *col, float *hsv, float *old, char mode, short retval);
 
 
 /* automatic aligning, horiz or verical */
diff --git a/source/blender/include/interface.h b/source/blender/include/interface.h
index 18cab39acce..ce4a56de5a5 100644
--- a/source/blender/include/interface.h
+++ b/source/blender/include/interface.h
@@ -114,7 +114,7 @@ struct uiBut {
 
 	char *poin;
 	float min, max;
-	float a1, a2, rt[4];
+	float a1, a2, hsv[3];	// hsv is temp memory for hsv buttons
 	float aspect;
 
 	void (*func)(void *, void *);
diff --git a/source/blender/src/drawimage.c b/source/blender/src/drawimage.c
index 8baef8a8c8b..99fd85b2ed1 100644
--- a/source/blender/src/drawimage.c
+++ b/source/blender/src/drawimage.c
@@ -803,7 +803,7 @@ static void image_panel_paint(short cntrl)	// IMAGE_HANDLER_PROPERTIES
 	if(uiNewPanel(curarea, block, "Paint", "Image", 10, 230, 318, 204)==0)
 		return;
 
-	uiBlockPickerButtons(block, &Gvp.r, hsv, old, 'f');	/* 'f' is for floating panel */
+	uiBlockPickerButtons(block, &Gvp.r, hsv, old, 'f', B_NOP);	/* 'f' is for floating panel */
 
 	//	offset= FPICK+2*DPICK+BPICK in interface.c... this goes wrong when defines change
 	uiBlockBeginAlign(block);
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c
index 788bc6bdf9c..1b8d63158d0 100644
--- a/source/blender/src/drawview.c
+++ b/source/blender/src/drawview.c
@@ -1513,7 +1513,7 @@ static void view3d_panel_object(short cntrl)	// VIEW3D_HANDLER_OBJECT
 	else if(G.f & (G_VERTEXPAINT|G_TEXTUREPAINT)) {
 		extern VPaint Gvp;         /* from vpaint */
 		static float hsv[3], old[3];	// used as temp mem for picker
-		uiBlockPickerButtons(block, &Gvp.r, hsv, old, 'f');	/* 'f' is for floating panel */
+		uiBlockPickerButtons(block, &Gvp.r, hsv, old, 'f', REDRAWBUTSEDIT);	/* 'f' is for floating panel */
 	}
 	else {
 		uiBlockBeginAlign(block);
diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c
index 83738c54731..dcc29863841 100644
--- a/source/blender/src/interface.c
+++ b/source/blender/src/interface.c
@@ -2208,39 +2208,38 @@ static float palette[UI_PALETTE_TOT+1][3]= {
 };  
 
 
-static void update_picker_buts(uiBlock *block, float *col)
+static void update_picker_buts(uiBlock *block, float *hsv)
 {
 	uiBut *bt;
-	float h, s, v;
+	float r, g, b;
 	
 	// this updates button strings, is hackish... but button pointers are on stack of caller function
-
-	rgb_to_hsv(col[0], col[1], col[2], &h, &s, &v);
+	hsv_to_rgb(hsv[0], hsv[1], hsv[2], &r, &g, &b);
 
 	for(bt= block->buttons.first; bt; bt= bt->next) {
 		if(bt->str[1]==' ') {
 			if(bt->str[0]=='R') {
-				ui_set_but_val(bt, col[0]);
+				ui_set_but_val(bt, r);
 				ui_check_but(bt);
 			}
 			else if(bt->str[0]=='G') {
-				ui_set_but_val(bt, col[1]);
+				ui_set_but_val(bt, g);
 				ui_check_but(bt);
 			}
 			else if(bt->str[0]=='B') {
-				ui_set_but_val(bt, col[2]);
+				ui_set_but_val(bt, b);
 				ui_check_but(bt);
 			}
 			else if(bt->str[0]=='H') {
-				ui_set_but_val(bt, h);
+				ui_set_but_val(bt, hsv[0]);
 				ui_check_but(bt);
 			}
 			else if(bt->str[0]=='S') {
-				ui_set_but_val(bt, s);
+				ui_set_but_val(bt, hsv[1]);
 				ui_check_but(bt);
 			}
 			else if(bt->str[0]=='V') {
-				ui_set_but_val(bt, v);
+				ui_set_but_val(bt, hsv[2]);
 				ui_check_but(bt);
 			}
 		}
@@ -2254,7 +2253,7 @@ static void do_palette_cb(void *bt1, void *col1)
 	uiBut *but1= (uiBut *)bt1;
 	uiBut *but;
 	float *col= (float *)col1;
-	float *fp;
+	float *fp, hsv[3];
 	
 	fp= (float *)but1->poin;
 	
@@ -2264,8 +2263,9 @@ static void do_palette_cb(void *bt1, void *col1)
 	else {
 		VECCOPY(col, fp);
 	}
-
-	update_picker_buts(but1->block, col);
+	
+	rgb_to_hsv(col[0], col[1], col[2], hsv, hsv+1, hsv+2);
+	update_picker_buts(but1->block, hsv);
 	
 	for (but= but1->block->buttons.first; but; but= but->next) {
 		ui_draw_but(but);
@@ -2276,22 +2276,22 @@ static void do_palette_cb(void *bt1, void *col1)
 
 /* bt1 is num but, col1 is pointer to original color */
 /* callback to handle changes in num-buts in picker */
-static void do_palette1_cb(void *bt1, void *col1)
+static void do_palette1_cb(void *bt1, void *hsv1)
 {
 	uiBut *but1= (uiBut *)bt1;
 	uiBut *but;
-	float *col= (float *)col1;
+	float *hsv= (float *)hsv1;
 	float *fp= NULL;
 	
-	if(but1->str[0]=='H') fp= (float *)but1->poin;
-	else if(but1->str[0]=='S') fp= ((float *)but1->poin)-1;
-	else if(but1->str[0]=='V') fp= ((float *)but1->poin)-2;
+	if(but1->str[0]=='R') fp= (float *)but1->poin;
+	else if(but1->str[0]=='G') fp= ((float *)but1->poin)-1;
+	else if(but1->str[0]=='B') fp= ((float *)but1->poin)-2;
 	
 	if(fp) {
-		hsv_to_rgb(fp[0], fp[1], fp[2], col, col+1, col+2);
+		rgb_to_hsv(fp[0], fp[1], fp[2], hsv, hsv+1, hsv+2);
 	}
-	
-	update_picker_buts(but1->block, col);
+
+	update_picker_buts(but1->block, hsv);	
 	
 	for (but= but1->block->buttons.first; but; but= but->next) {
 		ui_draw_but(but);
@@ -2304,16 +2304,11 @@ static void do_palette1_cb(void *bt1, void *col1)
 
 /* color picker, Gimp version. mode: 'f' = floating panel, 'p' =  popup */
 /* col = read/write to, hsv/old = memory for temporal use */
-void uiBlockPickerButtons(uiBlock *block, float *col, float *hsv, float *old, char mode)
+void uiBlockPickerButtons(uiBlock *block, float *col, float *hsv, float *old, char mode, short retval)
 {
 	uiBut *bt;
 	float h, offs;
-	int a, retval=B_NOP;
-
-	if(mode=='p') {
-		// safety, put in beginning otherwise tooltips wont work
-		retval= 0;	// prevents event that closes popup
-	}
+	int a;
 
 	VECCOPY(old, col);	// old color stored there, for palette_cb to work
 	
@@ -2352,19 +2347,19 @@ void uiBlockPickerButtons(uiBlock *block, float *col, float *hsv, float *old, ch
 
 	uiBlockBeginAlign(block);
 	bt= uiDefButF(block, NUM, retval, "R ",	offs, 110, 80,20, col, 0.0, 1.0, 10, 2, "");
-	uiButSetFunc(bt, do_palette1_cb, bt, col);
+	uiButSetFunc(bt, do_palette1_cb, bt, hsv);
 	bt= uiDefButF(block, NUM, retval, "G ",	offs, 90, 80,20, col+1, 0.0, 1.0, 10, 2, "");
-	uiButSetFunc(bt, do_palette1_cb, bt, col);
+	uiButSetFunc(bt, do_palette1_cb, bt, hsv);
 	bt= uiDefButF(block, NUM, retval, "B ",	offs, 70, 80,20, col+2, 0.0, 1.0, 10, 2, "");
-	uiButSetFunc(bt, do_palette1_cb, bt, col);
+	uiButSetFunc(bt, do_palette1_cb, bt, hsv);
 	
 	uiBlockBeginAlign(block);
 	bt= uiDefButF(block, NUM, retval, "H ",	offs, 40, 80,20, hsv, 0.0, 1.0, 10, 2, "");
-	uiButSetFunc(bt, do_palette1_cb, bt, col);
+	uiButSetFunc(bt, do_palette1_cb, bt, hsv);
 	bt= uiDefButF(block, NUM, retval, "S ",	offs, 20, 80,20, hsv+1, 0.0, 1.0, 10, 2, "");
-	uiButSetFunc(bt, do_palette1_cb, bt, col);
+	uiButSetFunc(bt, do_palette1_cb, bt, hsv);
 	bt= uiDefButF(block, NUM, retval, "V ",	offs, 0, 80,20, hsv+2, 0.0, 1.0, 10, 2, "");
-	uiButSetFunc(bt, do_palette1_cb, bt, col);
+	uiButSetFunc(bt, do_palette1_cb, bt, hsv);
 	uiBlockEndAlign(block);
 }
 
@@ -2397,7 +2392,7 @@ static int ui_do_but_COL(uiBut *but)
 	block->flag= UI_BLOCK_LOOP|UI_BLOCK_REDRAW;
 	block->themecol= TH_BUT_NUM;
 	
-	uiBlockPickerButtons(block, poin, hsv, old, 'p');
+	uiBlockPickerButtons(block, poin, hsv, old, 'p', 0);
 
 	/* and lets go */
 	block->direction= UI_TOP;
@@ -2416,14 +2411,25 @@ static int ui_do_but_COL(uiBut *but)
 
 }
 
+/* for picker, while editing hsv */
+static void ui_set_but_hsv(uiBut *but)
+{
+	float col[3];
+	
+	hsv_to_rgb(but->hsv[0], but->hsv[1], but->hsv[2], col, col+1, col+2);
+	ui_set_but_vectorf(but, col);
+}
+
 static int ui_do_but_HSVCUBE(uiBut *but)
 {
 	uiBut *bt;
-	float x, y, col[3], h,s,v;
+	float x, y;
 	short mval[2], mvalo[2];
 	
 	mvalo[0]= mvalo[1]= -32000;
 	
+	/* we work on persistant hsv, to prevent it being converted back and forth all the time */
+			   
 	while (get_mbut() & L_MOUSE) {
 		
 		uiGetMouse(mywinget(), mval);
@@ -2435,36 +2441,37 @@ static int ui_do_but_HSVCUBE(uiBut *but)
 			/* relative position within box */
 			x= ((float)mval[0]-but->x1)/(but->x2-but->x1);
 			y= ((float)mval[1]-but->y1)/(but->y2-but->y1);
+			CLAMP(x, 0.0, 1.0);
+			CLAMP(y, 0.0, 1.0);
 			
-			/* we're hacking values now to prevent rgb_to_hsv working wrong */
-			/* (ton) doesnt work yet... */
-			CLAMP(x, 0.0002, 0.9998);
-			CLAMP(y, 0.0002, 0.9998);
-			
-			/* assign position to color */
-			ui_get_but_vectorf(but, col);
-
-			/* another attempt to prevent hsv from hanging */
-			CLAMP(col[0], 0.0002, 0.9998);
-			CLAMP(col[1], 0.0002, 0.9998);
-			CLAMP(col[2], 0.0002, 0.9998);
-			
-			rgb_to_hsv(col[0], col[1], col[2], &h, &s, &v);
-			if(v==0.0) v= 0.0002;
-			if(s==0.0) s= 0.0002;
-			
-			if(but->a1==0) hsv_to_rgb(x, s, y, col, col+1, col+2);
-			else if(but->a1==1) hsv_to_rgb(x, y, v, col, col+1, col+2);
-			else if(but->a1==2) hsv_to_rgb(h, y, x, col, col+1, col+2);
-			else hsv_to_rgb(x, s, v, col, col+1, col+2);
+			if(but->a1==0) {
+				but->hsv[0]= x; 
+				but->hsv[2]= y; 
+				// hsv_to_rgb(x, s, y, col, col+1, col+2);
+			}
+			else if(but->a1==1) {
+				but->hsv[0]= x; 				
+				but->hsv[1]= y; 				
+				// hsv_to_rgb(x, y, v, col, col+1, col+2);
+			}
+			else if(but->a1==2) {
+ 				but->hsv[2]= x; 
+ 				but->hsv[1]= y; 
+				// hsv_to_rgb(h, y, x, col, col+1, col+2);
+			}
+			else {
+ 				but->hsv[0]= x; 
+				// hsv_to_rgb(x, s, v, col, col+1, col+2);
+			}
 	
-			ui_set_but_vectorf(but, col);
+			ui_set_but_hsv(but);	// converts to rgb
 			
 			// update button values and strings
-			update_picker_buts(but->block, col);
+			update_picker_buts(but->block, but->hsv);
 
 			/* we redraw the entire block */
 			for (bt= but->block->buttons.first; bt; bt= bt->next) {
+				if(but->poin == bt->poin) VECCOPY(bt->hsv, but->hsv);
 				ui_draw_but(bt);
 			}
 			ui_block_flush_back(but->block);
@@ -2546,10 +2553,8 @@ static void setup_file(uiBlock *block)
 	else {
 		but= block->buttons.first;
 		while(but) {
-			// if(but->rt[3]==1) {
 			ui_check_but(but);
 			fprintf(fp,"%d,%d,%d,%d   %s %s\n", (int)but->x1, (int)but->y1, (int)( but->x2-but->x1), (int)(but->y2-but->y1), but->str, but->tip);
-			// }
 			but= but->next;
 		}
 		fclose(fp);
@@ -2586,7 +2591,6 @@ static void edit_but(uiBlock *block, uiBut *but, uiEvent *uevent)
 			ui_draw_but(but);
 			ui_block_flush_back(but->block);
 			didit= 1;
-			but->rt[3]= 1;
 
 		}
 		/* idle for this poor code */
@@ -4283,6 +4287,12 @@ static uiBut *ui_def_but(uiBlock *block, int type, int retval, char *str, short
 		}
 	}
 	
+	if(but->type==HSVCUBE) { /* hsv buttons temp storage */
+		float rgb[3];
+		ui_get_but_vectorf(but, rgb);
+		rgb_to_hsv(rgb[0], rgb[1], rgb[2], but->hsv, but->hsv+1, but->hsv+2);
+	}
+
 	if ELEM8(but->type, HSVSLI , NUMSLI, MENU, TEX, LABEL, IDPOIN, BLOCK, BUTM) {
 		but->flag |= UI_TEXT_LEFT;
 	}
diff --git a/source/blender/src/interface_draw.c b/source/blender/src/interface_draw.c
index dcd96aa6914..db26797b79a 100644
--- a/source/blender/src/interface_draw.c
+++ b/source/blender/src/interface_draw.c
@@ -1554,13 +1554,14 @@ static void ui_draw_but_COL(uiBut *but)
 static void ui_draw_but_HSVCUBE(uiBut *but)
 {
 	int a;
-	float col[3], h,s,v;
+	float h,s,v;
 	float dx, dy, sx1, sx2, sy, x, y;
 	float col0[4][3];	// left half, rect bottom to top
 	float col1[4][3];	// right half, rect bottom to top
 	
-	ui_get_but_vectorf(but, col);
-	rgb_to_hsv(col[0], col[1], col[2], &h, &s, &v);
+	h= but->hsv[0];
+	s= but->hsv[1];
+	v= but->hsv[2];
 	
 	/* draw series of gouraud rects */
 	glShadeModel(GL_SMOOTH);