X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fcolorpicker.c;h=66f292a0369588ae675b237fc0580d1d8cf34a04;hb=2f2147a6c665f04d1b6e860dce8a8a093e7d2b9e;hp=a8403aee955b79c5171fd1c7e8e1b000894eb92c;hpb=b49d3f3ffff847ec761e15fcc6285a736cddcba3;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/colorpicker.c b/qcsrc/menu/xonotic/colorpicker.c
index a8403aee9..66f292a03 100644
--- a/qcsrc/menu/xonotic/colorpicker.c
+++ b/qcsrc/menu/xonotic/colorpicker.c
@@ -24,13 +24,13 @@ entity makeXonoticColorpicker(entity theTextbox)
 	return me;
 }
 
-void configureXonoticColorpickerXonoticColorpicker(entity me, entity theTextbox)
+void XonoticColorpicker_configureXonoticColorpicker(entity me, entity theTextbox)
 {
 	me.controlledTextbox = theTextbox;
 	me.configureImage(me, me.image);
 }
 
-float mousePressXonoticColorpicker(entity me, vector coords)
+float XonoticColorpicker_mousePress(entity me, vector coords)
 {
 	me.mouseDrag(me, coords);
 	return 1;
@@ -51,7 +51,26 @@ vector hslimage_color(vector v, vector margin)
         return hsl_to_rgb(v_x * 6 * eX + eY + v_y / 0.875 * eZ);
 }
 
-float mouseDragXonoticColorpicker(entity me, vector coords)
+vector color_hslimage(vector v, vector margin)
+{
+	vector pos;
+	v = rgb_to_hsl(v);
+	if (v_y)
+	{
+		pos_x = v_x / 6;
+		pos_y = v_z * 0.875;
+	}
+	else // grey scale
+	{
+		pos_x = v_z;
+		pos_y = 0.875 + 0.07;
+	}
+	pos_x = margin_x + pos_x * (1 - 2 * margin_x);
+	pos_y = margin_y + pos_y * (1 - 2 * margin_y);
+	return pos;
+}
+
+float XonoticColorpicker_mouseDrag(entity me, vector coords)
 {
 	float i;
 	for(;;)
@@ -97,23 +116,23 @@ float mouseDragXonoticColorpicker(entity me, vector coords)
 	return 1;
 }
 
-float mouseReleaseXonoticColorpicker(entity me, vector coords)
+float XonoticColorpicker_mouseRelease(entity me, vector coords)
 {
 	me.mouseDrag(me, coords);
 	return 1;
 }
 
-void focusLeaveXonoticColorpicker(entity me)
+void XonoticColorpicker_focusLeave(entity me)
 {
 	me.controlledTextbox.saveCvars(me.controlledTextbox);
 }
-float keyDownXonoticColorpicker(entity me, float key, float ascii, float shift)
+float XonoticColorpicker_keyDown(entity me, float key, float ascii, float shift)
 {
 	return me.controlledTextbox.keyDown(me.controlledTextbox, key, ascii, shift);
 }
-void drawXonoticColorpicker(entity me)
+void XonoticColorpicker_draw(entity me)
 {
-	drawImage(me);
+	SUPER(XonoticColorpicker).draw(me);
 
 	float B, C, aC;
 	C = cvar("r_textcontrast");