Upload Win10.skn by ConLenov, fix buttons position and name cases

git-svn-id: svn://kolibrios.org@7138 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2017-12-28 10:04:00 +00:00
parent 80f677ee39
commit 628200ff1e
14 changed files with 283 additions and 0 deletions

2
skins/Win10/Tupfile.lua Normal file
View File

@ -0,0 +1,2 @@
if tup.getconfig("NO_FASM") ~= "" then return end
tup.rule("Win10.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Win10.skn")

31
skins/Win10/Win10.asm Normal file
View File

@ -0,0 +1,31 @@
include 'me_skin.inc'
SKIN_PARAMS \
height = bmp_base.height,\
margins = [5:1:97:1],\
colors active = [binner=0xf3f3f3:\
bouter=0xffffff:\
bframe=0xf3f3f3],\
colors inactive = [binner=0xf3f3f3:\
bouter=0xffffff:\
bframe=0xf3f3f3],\
dtp = 'Win10.dtp'
SKIN_BUTTONS \
close = [-47:0][45:21],\
minimize = [-92:0][45:21]
SKIN_BITMAPS \
left active = bmp_left,\
left inactive = bmp_left1,\
oper active = bmp_oper,\
oper inactive = bmp_oper1,\
base active = bmp_base,\
base inactive = bmp_base1
BITMAP bmp_left ,'left.bmp'
BITMAP bmp_oper ,'oper.bmp'
BITMAP bmp_base ,'base.bmp'
BITMAP bmp_left1,'left_1.bmp'
BITMAP bmp_oper1,'oper_1.bmp'
BITMAP bmp_base1,'base_1.bmp'

BIN
skins/Win10/Win10.dtp Normal file

Binary file not shown.

10
skins/Win10/Win10.dtp.asm Normal file
View File

@ -0,0 +1,10 @@
frame dd 0xffffff
grab dd 0xffffff
grab_button dd 0x498DF7
grab_button_text dd 0xffffff
grab_text dd 0x0f0f0f
work dd 0xF3F3F3
work_button dd 0xf3f3f3
work_button_text dd 0x000000
work_text dd 0x000000
work_graph dd 0xB4CCE7

BIN
skins/Win10/Win10.skn Normal file

Binary file not shown.

BIN
skins/Win10/base.bmp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 142 B

BIN
skins/Win10/base_1.bmp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 142 B

4
skins/Win10/build.bat Normal file
View File

@ -0,0 +1,4 @@
@fasm Win10.dtp.asm Win10.dtp
@fasm Win10.asm Win10.skn
@kpack Win10.skn
@pause

BIN
skins/Win10/left.bmp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 230 B

BIN
skins/Win10/left_1.bmp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 230 B

235
skins/Win10/me_skin.inc Normal file
View File

@ -0,0 +1,235 @@
;============================================================================
; This file should be used to generate skins of new standard
;============================================================================
; skin file structure:
;----------------------------------------------------------------------------
; header:
; dd 'SKIN'
; dd = version (1 for now)
; dd @ params
; dd @ buttons
; dd @ bitmaps
; ...
;----------------------------------------------------------------------------
; NOTE: order of sections listed below is insignificant
; since they're identified by pointer in above header
;----------------------------------------------------------------------------
; ...
; params:
; dd = skin height
; dw = right margin
; dw = left margin
; dw = bottom margin
; dw = top margin
; dd = inner line color
; dd = outer line color
; dd = frame color
; dd = dtp file size
; ?? = dtp file itself
; ...
;----------------------------------------------------------------------------
; ...
; buttons:
; dd = button type (1 = close, 2 = minimize)
; dw = left button coord (could be negative)
; dw = top button coord (could be negative)
; dw = button width
; dw = button height
; ... etc for all buttons
; dd = 0 (end of buttons list)
; ...
;----------------------------------------------------------------------------
; ...
; bitmaps:
; dw = bitmap kind (1 = left, 2 = oper, 3 = base)
; dw = bitmap type (1 = active, 0 = inactive)
; dd @ bitmap
; ... etc for all bitmaps
; dd 0 (end of bitmaps list)
; ...
;----------------------------------------------------------------------------
; ...
; bitmap:
; dd = bitmap width
; dd = bitmap height
; ?? = raw bitmap data
; ... etc for all bitmaps
; ...
;============================================================================
dd 'SKIN',1,__params__,__buttons__,__bitmaps__
struc BITMAPFILEHEADER {
.bfType dw ? ; WORD
.bfSize dd ? ; DWORD
.bfReserved1 dw ? ; WORD
.bfReserved2 dw ? ; WORD
.bfOffBits dd ? ; DWORD
}
struc BITMAPINFOHEADER {
.biSize dd ? ; DWORD
.biWidth dd ? ; LONG
.biHeight dd ? ; LONG
.biPlanes dw ? ; WORD
.biBitCount dw ? ; WORD
.biCompression dd ? ; DWORD
.biSizeImage dd ? ; DWORD
.biXPelsPerMeter dd ? ; LONG
.biYPelsPerMeter dd ? ; LONG
.biClrUsed dd ? ; DWORD
.biClrImportant dd ? ; DWORD
}
struc _bmp {
.h BITMAPFILEHEADER
.i BITMAPINFOHEADER
}
virtual at 0
_bmp _bmp
end virtual
macro BITMAP _name*,_fname*
{
local w,h,a,r,g,b
virtual at 0
file _fname
load w dword from _bmp.i.biWidth
load h dword from _bmp.i.biHeight
end virtual
align 4
label _name
.width = w
.height = h
dd w,h
a=54+(w*3+(w mod 4))*(h-1)
size = $
repeat h
repeat w
virtual at 0
file _fname
load r from a+0
load g from a+1
load b from a+2
end virtual
db r,g,b
a=a+3
end repeat
a=a-w*3*2-(w mod 4)
end repeat
}
macro define_colors name,[col,val]
{
common
local a,b,c
forward
match =binner,col \{ a = val \}
match =bouter,col \{ b = val \}
match =bframe,col \{ c = val \}
common
name equ a,b,c
}
macro SKIN_PARAMS [a]
{
common
local _height,_margins,_colors,_colors_1,_dtp,_dtp_sz
__params__:
forward
match qq == ww,a
\{
match =height,qq \\{ _height = ww \\}
match =margins,qq \\{
match [q1:q2:q3:q4],ww
\\\{
_margins equ q3,q1,q4,q2
\\\}
\\}
match =colors =active,qq
\\{
match [q10==q11:q20==q21:q30==q31],ww
\\\{
define_colors _colors,q10,q11,q20,q21,q30,q31
\\\}
\\}
match =colors =inactive,qq
\\{
match [q10==q11:q20==q21:q30==q31],ww
\\\{
define_colors _colors_1,q10,q11,q20,q21,q30,q31
\\\}
\\}
match =dtp,qq \\{ _dtp equ ww \\}
\}
common
dd _height
dw _margins
dd _colors,_colors_1
virtual at 0
file _dtp
_dtp_sz = $
end virtual
dd _dtp_sz
file _dtp
}
macro SKIN_BUTTONS [a]
{
common
local btn
__buttons__:
forward
match qq == ww,a
\{
btn = 0
match =close,qq \\{ btn = 1 \\}
match =minimize,qq \\{ btn = 2 \\}
match [q1:q2][q3:q4],ww
\\{
if btn <> 0
dd btn
dw q1,q2,q3,q4
end if
\\}
\}
common
dd 0
}
macro SKIN_BITMAPS [a]
{
common
local bmp
__bitmaps__:
forward
match qq == ww,a
\{
bmp=-1
match qqq =active,qq \\{ bmp = 1 \\}
match qqq =inactive,qq \\{ bmp = 0 \\}
match =left qqq,qq
\\{
if bmp >= 0
dw 1,bmp
dd ww
end if
\\}
match =oper qqq,qq
\\{
if bmp >= 0
dw 2,bmp
dd ww
end if
\\}
match =base qqq,qq
\\{
if bmp >= 0
dw 3,bmp
dd ww
end if
\\}
\}
common
dd 0
}

BIN
skins/Win10/oper.bmp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

BIN
skins/Win10/oper_1.bmp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

View File

@ -4,6 +4,7 @@ skinlist = {
"Leency/Shkvorka/Shkvorka.skn",
"Leency/Blueberries/Blueberries.skn",
"loggy/loggy.skn",
"Win10/Win10.skn",
"_old/5imple Alpha/1.5imple Alpha/1.5imple Alpha.skn",
"_old/5imple Alpha/2.5imple Alpha/2.5imple Alpha.skn",
"_old/5imple Alpha/3.5imple Alpha/3.5imple Alpha.skn",