Rev 7658 | Rev 7661 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 7658 | Rev 7660 | ||
---|---|---|---|
Line 67... | Line 67... | ||
67 | { |
67 | { |
68 | dword tx = -strlen(text)*8+w/2+x; |
68 | dword tx = -strlen(text)*8+w/2+x; |
69 | dword ty = h/2-7+y; |
69 | dword ty = h/2-7+y; |
Line 70... | Line 70... | ||
70 | 70 | ||
71 | if (id>0) DefineButton(x,y,w,h,id,color_b); |
71 | if (id>0) DefineButton(x,y,w,h,id,color_b); |
72 | WriteText(tx+1,ty+1,0x90,LightenDarkenColor(color_b, -40),text); |
72 | WriteText(tx+1,ty+1,0x90,MixColors(color_b,0,230),text); |
73 | WriteText(tx,ty,0x90,color_t,text); |
73 | WriteText(tx,ty,0x90,color_t,text); |
Line 74... | Line 74... | ||
74 | } |
74 | } |
75 | 75 | ||
Line 82... | Line 82... | ||
82 | #define h padding_v + padding_v + 16 //16 font height |
82 | #define h padding_v + padding_v + 16 //16 font height |
83 | int tx = x + padding_h; |
83 | int tx = x + padding_h; |
84 | int ty = y + padding_v+1; |
84 | int ty = y + padding_v+1; |
85 | int tw = strlen(text)*8; |
85 | int tw = strlen(text)*8; |
86 | int w = tw + padding_h + padding_h; |
86 | int w = tw + padding_h + padding_h; |
87 | unsigned darker_color = LightenDarkenColor(system.color.work_button, -40); |
87 | unsigned darker_color = MixColors(system.color.work_button,0,230); |
Line 88... | Line 88... | ||
88 | 88 | ||
Line 89... | Line 89... | ||
89 | 89 | ||
Line 98... | Line 98... | ||
98 | } |
98 | } |
Line 99... | Line 99... | ||
99 | 99 | ||
100 | return w + right_margin; |
100 | return w + right_margin; |
Line -... | Line 101... | ||
- | 101 | } |
|
101 | } |
102 | |
102 | 103 | /* UNSTABLE |
|
103 | :unsigned LightenDarkenColor(dword color, amt) { |
104 | :unsigned LightenDarkenColor(dword color, amt) { |
104 | dword r = color >> 16 + amt << 16; |
105 | dword r = color >> 16 + amt << 16; |
105 | dword b = color >> 8 & 0x00FF + amt << 8; |
106 | dword b = color >> 8 & 0x00FF + amt << 8; |
106 | dword g = color & 0x0000FF + amt; |
107 | dword g = color & 0x0000FF + amt; |
- | 108 | return g | b | r ; |
|
Line 107... | Line 109... | ||
107 | return g | b | r ; |
109 | } |
108 | } |
110 | */ |
109 | 111 | ||
110 | :void ActiveButtonSwitch(int min, max) |
112 | :void ActiveButtonSwitch(int min, max) |