tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2024-12-26 15:26:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

16colors

Browse source
This commit is contained in:
y4my4my4m 2023-05-31 01:14:03 +09:00
parent 782bba268c
commit 9cf9e07805
1 changed files with 14 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/Home/PaletteEditor/PaletteEdit.ZC
View file

@ -44,6 +44,7 @@ U0 DrawCtrlSlider(CDC *dc, CCtrl *c)
i, k, j,// l, i, k, j,// l,
pos, col, pos, col,
bias; bias;
I64 rectSize = size / 16; // Size of each color rectangle
CBGR24 tempColor; CBGR24 tempColor;
/////////////////////// ///////////////////////
@ -53,20 +54,8 @@ U0 DrawCtrlSlider(CDC *dc, CCtrl *c)
// current color box preview // current color box preview
dc->color = BLACK; dc->color = BLACK;
GrPrint(dc, 10, 10, "Preview:"); GrPrint(dc, 10, 10, "Preview:");
 GrPrint(dc, 10, 26, "Current Color: #%d", selected_color);
// pixel loop for current color preview
for (i = 0; i <= 12; i++)
for (j = 0; j <= 12; j++)
{
tempColor = gr_palette[selected_color];
if (i < border || i > 12 - border || j < border || j > 12 - border)
tempColor = 0x000000;
// draw color preview
dc->color = tempColor;
GrPlot(dc, c->win_task->pix_left + 78 + i, t + 7 + j);
// DrawPixel(c->win_task->pix_left + 78 + i, t + 7 + j, tempColor);
}
GrPrint(dc, 10, 26, "Current Color: #%d", selected_color);
if (selected_color == 15) if (selected_color == 15)
dc->color = LTGRAY; dc->color = LTGRAY;
else if (gr_palette[selected_color] > 0xCCCCCC) else if (gr_palette[selected_color] > 0xCCCCCC)
@ -76,6 +65,9 @@ U0 DrawCtrlSlider(CDC *dc, CCtrl *c)
GrRect(dc, 94, 8, 58, 12); GrRect(dc, 94, 8, 58, 12);
dc->color = selected_color; dc->color = selected_color;
// Color preview next to #hex
GrRect(dc, 78, 8, 12, 12);
// #Hex value
GrPrint(dc, 95, 10, "#%x%x%x", gr_palette[selected_color].r, GrPrint(dc, 95, 10, "#%x%x%x", gr_palette[selected_color].r,
gr_palette[selected_color].g, gr_palette[selected_color].g,
gr_palette[selected_color].b); gr_palette[selected_color].b);
@ -155,25 +147,6 @@ U0 DrawCtrlSlider(CDC *dc, CCtrl *c)
for (i = 0; i < COLORS_NUM; i++) for (i = 0; i < COLORS_NUM; i++)
{ {
for (j = 0; j <= size; j++)
{
for (k = 0; k <= size; k++)
{
tempColor = gr_palette[i];
// black borders
if (k < border || k > size - border || j < border || j > size - border - 1)
{
if (selected_color == i)
tempColor = 0xFFFFFF;
else
tempColor = 0x000000;
}
// draw color preview
dc->color = tempColor;
GrPlot(dc, c->win_task->pix_left + j + (size * i), c->win_task->pix_bottom - size * 1.5 + k);
// DrawPixel(c->win_task->pix_left + j + (size * i), c->win_task->pix_bottom - size * 1.5 + k, tempColor);
}
}
// color label and text preview // color label and text preview
// TODO: THIS LOGIC DOESNT WORK ON LIGHT THEMES // TODO: THIS LOGIC DOESNT WORK ON LIGHT THEMES
// if color too light or too dark add bg // if color too light or too dark add bg
@ -188,6 +161,11 @@ U0 DrawCtrlSlider(CDC *dc, CCtrl *c)
dc->color = LTRED;*/ dc->color = LTRED;*/
else else
dc->color = 15; dc->color = 15;
// Border for preview box
GrRect(dc, (size * i)-1, c->win_task->pix_height - (size*1.5)-1, size+2, size+2);
if (i == selected_color) if (i == selected_color)
dc->color = 0; dc->color = 0;
GrRect(dc, 6, (size2 * 2) + 65 + 16 * i, 80, 18); GrRect(dc, 6, (size2 * 2) + 65 + 16 * i, 80, 18);
@ -205,6 +183,9 @@ U0 DrawCtrlSlider(CDC *dc, CCtrl *c)
bias = (size / 2) - 8; bias = (size / 2) - 8;
GrPrint(dc, bias + (i * size), c->win_task->pix_height - (size * .6) + (size / 4), "%d", i); GrPrint(dc, bias + (i * size), c->win_task->pix_height - (size * .6) + (size / 4), "%d", i);
GrPrint(dc, 10, (size2 * 2) + 70 + 16 * i, "#%d: Test", i); GrPrint(dc, 10, (size2 * 2) + 70 + 16 * i, "#%d: Test", i);
// preview box
GrRect(dc, (size * i), c->win_task->pix_height - (size*1.5), size, size);
} }