Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Ebb <matt@mke3.net>2004-08-05 16:40:20 +0400
committerMatt Ebb <matt@mke3.net>2004-08-05 16:40:20 +0400
commit89ba6db7bdfaf21b700afa7cb3d9863ba5aa8482 (patch)
treee9cadfbf11db8ad206d60e8f113f4943ae165d6b
parentdcc24c09f037a5b618b20004b1415b1297999c94 (diff)
Small tweak to the colour picker - make the palettev2.34
buttons rectangular, even in the rounded theme
-rw-r--r--source/blender/src/interface.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c
index b56050b4d94..184e796b9be 100644
--- a/source/blender/src/interface.c
+++ b/source/blender/src/interface.c
@@ -2201,6 +2201,9 @@ void uiBlockPickerButtons(uiBlock *block, float *col, float *hsv, float *old, ch
uiButSetFlag(bt, UI_NO_HILITE);
// palette
+
+ uiBlockSetEmboss(block, UI_EMBOSSP);
+
bt=uiDefButF(block, COL, retval, "", FPICK+DPICK, 0, BPICK,BPICK, old, 0.0, 0.0, -1, 0, "Old color, click to restore");
uiButSetFunc(bt, do_palette_cb, bt, col);
uiDefButF(block, COL, retval, "", FPICK+DPICK, BPICK+DPICK, BPICK,60-BPICK-DPICK, col, 0.0, 0.0, -1, 0, "Active color");
@@ -2214,12 +2217,15 @@ void uiBlockPickerButtons(uiBlock *block, float *col, float *hsv, float *old, ch
uiButSetFunc(bt, do_palette_cb, bt, col);
}
uiBlockEndAlign(block);
+
+ uiBlockSetEmboss(block, UI_EMBOSSX);
// buttons
rgb_to_hsv(col[0], col[1], col[2], hsv, hsv+1, hsv+2);
offs= FPICK+2*DPICK+BPICK;
+
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);