Rev 7798 | Rev 7878 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 7798 | Rev 7806 | ||
---|---|---|---|
Line 139... | Line 139... | ||
139 | ProcessKeys(); |
139 | ProcessKeys(); |
140 | break; |
140 | break; |
Line 141... | Line 141... | ||
141 | 141 | ||
142 | case evReDraw: |
142 | case evReDraw: |
143 | DefineAndDrawWindow(win_x, win_y, menu1.w+4, menu1.h+4, 0x01, 0, 0, 0x01fffFFF); |
143 | DefineAndDrawWindow(win_x, win_y, menu1.w+4, menu1.h+4, 0x01, 0, 0, 0x01fffFFF); |
144 | system.color.get(); |
144 | sc.get(); |
145 | Draw3DPopup(0,0,menu1.w+2,menu1.h+2); |
145 | Draw3DPopup(0,0,menu1.w+2,menu1.h+2); |
146 | draw_list(); |
146 | draw_list(); |
147 | } |
147 | } |
Line 186... | Line 186... | ||
186 | static bool skin_dark; |
186 | static bool skin_dark; |
Line 187... | Line 187... | ||
187 | 187 | ||
188 | static bool colors_set; |
188 | static bool colors_set; |
189 | if (!colors_set) { |
189 | if (!colors_set) { |
190 | colors_set = true; |
190 | colors_set = true; |
191 | inactive_background_color = MixColors(system.color.work, 0xFFFfff,230); |
191 | inactive_background_color = MixColors(sc.work, 0xFFFfff,230); |
192 | active_background_color = MixColors(system.color.work_button, system.color.work,230); |
192 | active_background_color = MixColors(sc.button, sc.work,230); |
193 | active_top_border_color = MixColors(system.color.work_graph, system.color.work_button,240); |
193 | active_top_border_color = MixColors(sc.work_graph, sc.button,240); |
194 | inactive_text_shadow_color = MixColors(system.color.work,0xFFFfff,120); |
194 | inactive_text_shadow_color = MixColors(sc.work,0xFFFfff,120); |
195 | skin_dark = skin_is_dark(); |
195 | skin_dark = skin_is_dark(); |
Line 196... | Line 196... | ||
196 | } |
196 | } |
197 | 197 | ||
198 | for (i=0; i |
198 | for (i=0; i |
199 | { |
199 | { |
200 | if (streq(names.get(i), "-")) { |
200 | if (streq(names.get(i), "-")) { |
201 | DrawBar(menu1.x, item_y+0, menu1.w, 1, inactive_background_color); |
201 | DrawBar(menu1.x, item_y+0, menu1.w, 1, inactive_background_color); |
202 | DrawBar(menu1.x-1, item_y+1, menu1.w+1, 1, system.color.work_dark); |
202 | DrawBar(menu1.x-1, item_y+1, menu1.w+1, 1, sc.work_dark); |
203 | DrawBar(menu1.x, item_y+2, menu1.w, 1, system.color.work_light); |
203 | DrawBar(menu1.x, item_y+2, menu1.w, 1, sc.work_light); |
204 | DrawBar(menu1.x, item_y+3, menu1.w, 1, inactive_background_color); |
204 | DrawBar(menu1.x, item_y+3, menu1.w, 1, inactive_background_color); |
205 | //DrawBar(menu1.x, item_y+0, menu1.w, 4, inactive_background_color); |
205 | //DrawBar(menu1.x, item_y+0, menu1.w, 4, inactive_background_color); |
206 | //DrawBar(13, item_y+1, menu1.w-24, 1, system.color.work_dark); |
206 | //DrawBar(13, item_y+1, menu1.w-24, 1, sc.work_dark); |
207 | //DrawBar(13, item_y+2, menu1.w-24, 1, system.color.work_light); |
207 | //DrawBar(13, item_y+2, menu1.w-24, 1, sc.work_light); |
208 | item_y += SEP_H; |
208 | item_y += SEP_H; |
209 | } else { |
209 | } else { |
210 | if (item_i==menu1.cur_y) { |
210 | if (item_i==menu1.cur_y) { |
211 | hotkey_color = name_color = system.color.work_button_text; |
211 | hotkey_color = name_color = sc.button_text; |
212 | DrawBar(menu1.x, item_y+1, menu1.w, ITEM_H-2, active_background_color); |
212 | DrawBar(menu1.x, item_y+1, menu1.w, ITEM_H-2, active_background_color); |
213 | DrawBar(menu1.x, item_y, menu1.w, 1, active_top_border_color); |
213 | DrawBar(menu1.x, item_y, menu1.w, 1, active_top_border_color); |
214 | DrawBar(menu1.x, item_y+ITEM_H-1, menu1.w, 1, system.color.work_light); |
214 | DrawBar(menu1.x, item_y+ITEM_H-1, menu1.w, 1, sc.work_light); |
215 | } else { |
215 | } else { |
216 | name_color = system.color.work_text; |
216 | name_color = sc.work_text; |
217 | hotkey_color = system.color.work_graph; |
217 | hotkey_color = sc.work_graph; |
218 | DrawBar(menu1.x, item_y, menu1.w, ITEM_H, inactive_background_color); |
218 | DrawBar(menu1.x, item_y, menu1.w, ITEM_H, inactive_background_color); |
219 | if (!skin_dark) WriteText(13+1, item_y + menu1.text_y +1, 0x80, |
219 | if (!skin_dark) WriteText(13+1, item_y + menu1.text_y +1, 0x80, |
220 | inactive_text_shadow_color, names.get(i)); |
220 | inactive_text_shadow_color, names.get(i)); |