diff --git a/data/common/icons32.png b/data/common/icons32.png index 04135b28f4..25c2ab011f 100644 Binary files a/data/common/icons32.png and b/data/common/icons32.png differ diff --git a/programs/cmm/eolite/include/gui.h b/programs/cmm/eolite/include/gui.h index 098f0b44fc..db18a4611d 100644 --- a/programs/cmm/eolite/include/gui.h +++ b/programs/cmm/eolite/include/gui.h @@ -2,10 +2,11 @@ void Scroll() { dword i; - word sc_x = files.x + files.w; - word sc_y = files.y; - word sc_h = files.h - 16; - word sc_slider_y; + dword sc_x = files.x + files.w; + dword sc_y = files.y; + dword sc_h = files.h - 16; + dword sc_slider_y; + dword sc_center; if (files.count<=0) { @@ -24,6 +25,18 @@ void Scroll() { DrawRectangle3D(sc_x+1,sc_slider_y+1,14,sc_slider_h-2, system.color.work_light , system.color.work_dark); if (!scroll_used) for (i=0; i<13; i++) DrawBar(sc_x + 2 + i, sc_slider_y+2, 1, sc_slider_h-3, col.work_gradient[13-i]); if (scroll_used) for (i=0; i<13; i++) DrawBar(sc_x + 2 + i, sc_slider_y+2, 1, sc_slider_h-3, col.work_gradient[i]); + + sc_center = sc_slider_h / 2 + sc_slider_y; + + DrawBar(sc_x+4, sc_center-3, 8, 1, col.graph); + DrawBar(sc_x+4+1, sc_center-2, 8, 1, system.color.work_light); + + DrawBar(sc_x+3, sc_center, 10, 1, col.graph); + DrawBar(sc_x+3+1, sc_center+1, 10, 1, system.color.work_light); + + DrawBar(sc_x+4, sc_center+3, 8, 1, col.graph); + DrawBar(sc_x+4+1, sc_center+4, 8, 1, system.color.work_light); + //area before slider if (sc_slider_y > sc_y + 1) { diff --git a/programs/testing/genfiles/GenFiles.asm b/programs/testing/genfiles/GenFiles.asm index 8d9d141544..6e6036e143 100644 --- a/programs/testing/genfiles/GenFiles.asm +++ b/programs/testing/genfiles/GenFiles.asm @@ -53,9 +53,9 @@ count dd 0 pb: .value dd 0 .left dd 8 -.top dd 25 +.top dd 38 .width dd 269 -.height dd 10 +.height dd 15 .style dd 0 .min dd 0 .max dd 0 @@ -68,10 +68,10 @@ edit1: .left dd 48 .top dd 8 .color dd 0X00FFFFFF -.shift_color dd 0 +.shift_color dd 0x94AECE .focus_border_color dd 0 .blur_border_color dd 0 -.text_color dd 0 +.text_color dd 0x10000000 .max dd EDIT1_MAX_LENGTH .text dd text_buffer1 .mouse_variable dd 0 @@ -89,10 +89,10 @@ edit2: .left dd 216 .top dd 8 .color dd 0X00FFFFFF -.shift_color dd 0 +.shift_color dd 0x94AECE .focus_border_color dd 0 .blur_border_color dd 0 -.text_color dd 0 +.text_color dd 0x10000000 .max dd EDIT2_MAX_LENGTH .text dd text_buffer2 .mouse_variable dd 0 @@ -282,8 +282,8 @@ DoAction: ; ------------------------------------- ; DrawStatus: mov eax, 4 - mov ecx, 0xC0000000 - mov ebx, (168 << 16) | 38 + mov ecx, 0xD0000000 + mov ebx, (297 << 16) | 38 mov edx, [status_string] mov edi, 0x00FFFFFF int 64 @@ -301,8 +301,8 @@ On_Redraw: int 64 ; DrawWindow xor eax, eax - mov ebx, 360 - mov ecx, 74 + mov ebx, (50 << 16) | 360 + mov ecx, (50 << 16) | 88 mov edx, 0x34FFFFFF mov edi, sz_caption xor esi, esi @@ -325,23 +325,21 @@ On_Redraw: int 64 ; DrawTexts mov eax, 4 - mov ecx, 0x80000000 + mov ecx, 0x90000000 ; Path: mov ebx, (8 << 16) | 11 mov edx, sz_path int 64 ; Count: - mov ebx, (176 << 16) | 11 + mov ebx, (168 << 16) | 11 mov edx, sz_count int 64 ; Start: - mov ebx, (302 << 16) | 18 + mov ebx, (297 << 16) | 15 mov edx, sz_start int 64 ; draw status - mov ebx, (168 << 16) | 38 - mov edx, [status_string] - int 64 + call DrawStatus ; RedrawFinish mov eax, 12 mov ebx, 2 diff --git a/programs/testing/genfiles/make.bat b/programs/testing/genfiles/make.bat index cc98a3530f..f980a1f3f8 100644 --- a/programs/testing/genfiles/make.bat +++ b/programs/testing/genfiles/make.bat @@ -1,2 +1,3 @@ +@del GenFiles nasm -f bin GenFiles.asm -o GenFiles pause diff --git a/skins/Leency/Workbench/Tupfile.lua b/skins/Leency/Workbench/Tupfile.lua new file mode 100644 index 0000000000..41b29447e1 --- /dev/null +++ b/skins/Leency/Workbench/Tupfile.lua @@ -0,0 +1,2 @@ +if tup.getconfig("NO_FASM") ~= "" then return end +tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Workbench.skn") diff --git a/skins/Leency/Workbench/build.bat b/skins/Leency/Workbench/build.bat new file mode 100644 index 0000000000..4da7975657 --- /dev/null +++ b/skins/Leency/Workbench/build.bat @@ -0,0 +1,4 @@ +@fasm default.dtp.asm default.dtp +@fasm default.asm default.skn +@kpack default.skn +@pause \ No newline at end of file diff --git a/skins/Leency/Workbench/center1.bmp b/skins/Leency/Workbench/center1.bmp new file mode 100644 index 0000000000..126fff382d Binary files /dev/null and b/skins/Leency/Workbench/center1.bmp differ diff --git a/skins/Leency/Workbench/center2.bmp b/skins/Leency/Workbench/center2.bmp new file mode 100644 index 0000000000..1b3e2171ca Binary files /dev/null and b/skins/Leency/Workbench/center2.bmp differ diff --git a/skins/Leency/Workbench/default.asm b/skins/Leency/Workbench/default.asm new file mode 100644 index 0000000000..5c0b7113eb --- /dev/null +++ b/skins/Leency/Workbench/default.asm @@ -0,0 +1,31 @@ +include '../skin.inc' + +SKIN_PARAMS \ + height = bmp_center1.height,\ ; skin height + margins = [7:5:43:5],\ ; margins [left:top:right:bottom] + colors active = [binner=0x083040:\ ; border inner + bouter=0x083040:\ ; border outer + bframe=0x588090],\ ; border middle + colors inactive = [binner=0x34404C:\ ; border inner + bouter=0x34404C:\ ; border outer + bframe=0x808C98],\ ; border middle + dtp = 'default.dtp' ; dtp colors + +SKIN_BUTTONS \ + close = [-23:1][22:22],\ ; buttons coordinates + minimize = [-46:1][22:22] ; [left:top][width:height] + +SKIN_BITMAPS \ + left active = bmp_left1,\ ; skin bitmaps pointers + left inactive = bmp_left2,\ + oper active = bmp_right1,\ + oper inactive = bmp_right2,\ + base active = bmp_center1,\ + base inactive = bmp_center2 + +BITMAP bmp_left1, 'left1.bmp' ; skin bitmaps +BITMAP bmp_left2, 'left2.bmp' +BITMAP bmp_right1, 'right1.bmp' +BITMAP bmp_right2, 'right2.bmp' +BITMAP bmp_center1,'center1.bmp' +BITMAP bmp_center2,'center2.bmp' diff --git a/skins/Leency/Workbench/default.dtp b/skins/Leency/Workbench/default.dtp new file mode 100644 index 0000000000..e3dafcf175 Binary files /dev/null and b/skins/Leency/Workbench/default.dtp differ diff --git a/skins/Leency/Workbench/default.dtp.asm b/skins/Leency/Workbench/default.dtp.asm new file mode 100644 index 0000000000..2c08a46be8 --- /dev/null +++ b/skins/Leency/Workbench/default.dtp.asm @@ -0,0 +1,14 @@ +struc system_colors + { + .unused1 dd 0x586786 + .unused2 dd 0xFEFEFE + .work_3d_dark dd 0x78878D + .work_3d_light dd 0xC7CCCE + .window_title dd 0x000000 + .work dd 0x98A4A8 + .work_button dd 0x588090 + .work_button_text dd 0xFEFEFE + .work_text dd 0x000000 + .work_graph dd 0x383C38 + } +struct system_colors \ No newline at end of file diff --git a/skins/Leency/Workbench/left1.bmp b/skins/Leency/Workbench/left1.bmp new file mode 100644 index 0000000000..0bc4d0aed2 Binary files /dev/null and b/skins/Leency/Workbench/left1.bmp differ diff --git a/skins/Leency/Workbench/left2.bmp b/skins/Leency/Workbench/left2.bmp new file mode 100644 index 0000000000..fe111c79d3 Binary files /dev/null and b/skins/Leency/Workbench/left2.bmp differ diff --git a/skins/Leency/Workbench/right1.bmp b/skins/Leency/Workbench/right1.bmp new file mode 100644 index 0000000000..c55eca0dd3 Binary files /dev/null and b/skins/Leency/Workbench/right1.bmp differ diff --git a/skins/Leency/Workbench/right2.bmp b/skins/Leency/Workbench/right2.bmp new file mode 100644 index 0000000000..fa29fc96f0 Binary files /dev/null and b/skins/Leency/Workbench/right2.bmp differ diff --git a/skins/skinlist.lua b/skins/skinlist.lua index 9167733eec..f35532bcdf 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -8,6 +8,7 @@ skinlist = { "Leency/ObsidianOS/ObsidianOS.skn", "Leency/Octo_flat/Octo_flat.skn", "Leency/Shkvorka/Shkvorka.skn", +"Leency/Workbench/Workbench.skn", "Leency/Yeah/Yeah.skn", "loggy/loggy.skn", "night/night.skn",