mirror of
https://github.com/Zeal-Operating-System/ZealOS.git
synced 2024-12-25 23:10:32 +00:00
Updates
This commit is contained in:
parent
85fe748331
commit
fe04a340db
27 changed files with 61 additions and 50 deletions
|
@ -38,12 +38,9 @@ U0 DrawCtrlSlider(CDC *dc, CCtrl *c)
|
||||||
|
|
||||||
CSliderState *s = c->state;
|
CSliderState *s = c->state;
|
||||||
I64 size = (c->win_task->pix_width / 16),
|
I64 size = (c->win_task->pix_width / 16),
|
||||||
border = size / 16,
|
|
||||||
size2 = (c->win_task->pix_height / 32),
|
size2 = (c->win_task->pix_height / 32),
|
||||||
// slider_amount = 3,
|
|
||||||
i, k, j,// l,
|
|
||||||
pos, col,
|
pos, col,
|
||||||
bias;
|
i, bias;
|
||||||
CBGR24 tempColor;
|
CBGR24 tempColor;
|
||||||
|
|
||||||
///////////////////////
|
///////////////////////
|
||||||
|
@ -55,14 +52,18 @@ U0 DrawCtrlSlider(CDC *dc, CCtrl *c)
|
||||||
GrPrint(dc, 10, 10, "Preview:");
|
GrPrint(dc, 10, 10, "Preview:");
|
||||||
|
|
||||||
// pixel loop for current color preview
|
// pixel loop for current color preview
|
||||||
for (i = 0; i <= 12; i++)
|
// for (i = 0; i <= 12; i++)
|
||||||
for (j = 0; j <= 12; j++)
|
// for (j = 0; j <= 12; j++)
|
||||||
{
|
// {
|
||||||
|
// tempColor = gr_palette[selected_color];
|
||||||
|
// if (i < border || i > 12 - border || j < border || j > 12 - border)
|
||||||
|
// tempColor = 0x000000;
|
||||||
|
// // DrawPixel(c->win_task->pix_left + 78 + i, t + 7 + j, tempColor);
|
||||||
|
// }
|
||||||
tempColor = gr_palette[selected_color];
|
tempColor = gr_palette[selected_color];
|
||||||
if (i < border || i > 12 - border || j < border || j > 12 - border)
|
dc->color = tempColor;
|
||||||
tempColor = 0x000000;
|
GrRect(dc, c->win_task->pix_left + 78 , t + 7,c->win_task->pix_left + 78 + 12, t + 7 +12);
|
||||||
DrawPixel(c->win_task->pix_left + 78 + i, t + 7 + j, tempColor);
|
|
||||||
}
|
|
||||||
GrPrint(dc, 10, 26, "Current Color: #%d", selected_color);
|
GrPrint(dc, 10, 26, "Current Color: #%d", selected_color);
|
||||||
if (selected_color == 15)
|
if (selected_color == 15)
|
||||||
dc->color = LTGRAY;
|
dc->color = LTGRAY;
|
||||||
|
@ -152,23 +153,28 @@ 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 (j = 0; j <= size; j++)
|
||||||
{
|
// {
|
||||||
for (k = 0; k <= size; k++)
|
// 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;
|
||||||
|
// }
|
||||||
|
// // color preview
|
||||||
|
// DrawPixel(c->win_task->pix_left + j + (size * i), c->win_task->pix_bottom - size * 1.5 + k, tempColor);
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
tempColor = gr_palette[i];
|
tempColor = gr_palette[i];
|
||||||
// black borders
|
dc->color = tempColor;
|
||||||
if (k < border || k > size - border || j < border || j > size - border - 1)
|
GrRect(dc, c->win_task->pix_left + i, c->win_task->pix_bottom - size * 1.5, c->win_task->pix_left + (size * i), c->win_task->pix_bottom - size * 1.5);
|
||||||
{
|
|
||||||
if (selected_color == i)
|
|
||||||
tempColor = 0xFFFFFF;
|
|
||||||
else
|
|
||||||
tempColor = 0x000000;
|
|
||||||
}
|
|
||||||
// color preview
|
|
||||||
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
|
||||||
|
|
File diff suppressed because one or more lines are too long
2
src/Home/Wallpapers/1024/12.DD
Executable file
2
src/Home/Wallpapers/1024/12.DD
Executable file
File diff suppressed because one or more lines are too long
2
src/Home/Wallpapers/1024/13.DD
Executable file
2
src/Home/Wallpapers/1024/13.DD
Executable file
File diff suppressed because one or more lines are too long
2
src/Home/Wallpapers/1024/14.DD
Executable file
2
src/Home/Wallpapers/1024/14.DD
Executable file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
2
src/Home/Wallpapers/1024/2.DD
Executable file
2
src/Home/Wallpapers/1024/2.DD
Executable file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
2
src/Home/Wallpapers/1280/1.DD
Executable file
2
src/Home/Wallpapers/1280/1.DD
Executable file
File diff suppressed because one or more lines are too long
2
src/Home/Wallpapers/1280/2.DD
Executable file
2
src/Home/Wallpapers/1280/2.DD
Executable file
File diff suppressed because one or more lines are too long
2
src/Home/Wallpapers/1280/3.DD
Executable file
2
src/Home/Wallpapers/1280/3.DD
Executable file
File diff suppressed because one or more lines are too long
2
src/Home/Wallpapers/1280/4.DD
Executable file
2
src/Home/Wallpapers/1280/4.DD
Executable file
File diff suppressed because one or more lines are too long
|
@ -114,6 +114,11 @@ U0 Cvt(U8 *ff_mask="*", U8 *fu_flags="+r+l-i+S")
|
||||||
Find("RWF_SCROLL", ff_mask,fu_flags,"RAWF_SCROLL");
|
Find("RWF_SCROLL", ff_mask,fu_flags,"RAWF_SCROLL");
|
||||||
Find("RawDr", ff_mask,fu_flags,"RawDumpRegs");
|
Find("RawDr", ff_mask,fu_flags,"RawDumpRegs");
|
||||||
|
|
||||||
|
//Added by y4my4m August 13 2023
|
||||||
|
Find("ms_hard", ff_mask,fu_flags,"mouse_hard");
|
||||||
|
Find("MsUpdate", ff_mask,fu_flags,"MouseUpdate");
|
||||||
|
Find("FlushMsgs", ff_mask,fu_flags,"FlushMessages");
|
||||||
|
|
||||||
"\n$$BK,1$$$$LTRED$$Might want to go over these$$FG$$$$BK,0$$\n";
|
"\n$$BK,1$$$$LTRED$$Might want to go over these$$FG$$$$BK,0$$\n";
|
||||||
Find("MemSet", ff_mask, fu_flags);
|
Find("MemSet", ff_mask, fu_flags);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue