Chameleon

Chameleon Commit Details

Date:2010-07-25 05:54:59 (10 years 4 months ago)
Author:Evan Lojewski
Commit:241
Parents: 240
Message:Removed rollover check and changed code to load non _o files if _o doesn't exist instead of generic_o.png. If this isn't desireable, feal free to change it back.
Changes:
M/branches/zef/i386/boot2/gui.c

File differences

branches/zef/i386/boot2/gui.c
3030
3131
3232
33
33
3434
3535
3636
......
299299
300300
301301
302
302
303303
304
304
305305
306
306
307307
308
308
309309
310
310
311311
312
312
313313
314314
315315
......
685685
686686
687687
688
688
689689
690690
691691
......
750750
751751
752752
753
753
754754
755755
756756
#define vram VIDEO(baseAddr)
int lasttime = 0; // we need this for animating maybe
bool useRollOver = false;
//bool useRollOver = false;
extern int gDeviceCount;
LOADPNG(device_generic, IMG_REQUIRED);
LOADPNG(device_generic_o, iDeviceGeneric);
LOADPNG(device_hfsplus, iDeviceGeneric);
LOADPNG(device_hfsplus_o, iDeviceGeneric_o);
LOADPNG(device_hfsplus_o, iDeviceHFS);
LOADPNG(device_ext3, iDeviceGeneric);
LOADPNG(device_ext3_o, iDeviceGeneric_o);
LOADPNG(device_ext3_o, iDeviceEXT3);
LOADPNG(device_fat16, iDeviceGeneric);
LOADPNG(device_fat16_o, iDeviceGeneric_o);
LOADPNG(device_fat16_o, iDeviceFAT16);
LOADPNG(device_fat32, iDeviceGeneric);
LOADPNG(device_fat32_o, iDeviceGeneric_o);
LOADPNG(device_fat32_o, iDeviceFAT32);
LOADPNG(device_ntfs, iDeviceGeneric);
LOADPNG(device_ntfs_o, iDeviceGeneric_o);
LOADPNG(device_ntfs_o, iDeviceNTFS);
LOADPNG(device_cdrom, iDeviceGeneric);
LOADPNG(device_cdrom_o, iDeviceGeneric_o);
LOADPNG(device_cdrom_o, iDeviceCDROM);
LOADPNG(device_selection, IMG_REQUIRED);
LOADPNG(device_scroll_prev, IMG_REQUIRED);
colorFont(&font_console, gui.screen.font_console_color);
// use the alternate images for the selected item if available.
useRollOver = (images[iDeviceGeneric].image->pixels != images[iDeviceGeneric_o].image->pixels) ? true : false;
//useRollOver = (images[iDeviceGeneric].image->pixels != images[iDeviceGeneric_o].image->pixels) ? true : false;
// create the screen & window buffers
if (createBackBuffer(&gui.screen) == 0) {
}
// Use the next (device_*_o) image for the selected item if available.
if (isSelected && useRollOver) devicetype++;
if (isSelected/* && useRollOver*/) devicetype++;
// draw icon
blend( images[devicetype].image, buffer, centeredAt( images[devicetype].image, p ));

Archive Download the corresponding diff file

Revision: 241