--- gui.c 2013-06-27 21:06:02.000000000 +1000
+++ gui_custom.c 2013-06-28 01:16:04.000000000 +1000
@@ -85,6 +85,8 @@
iDeviceFAT32_o,
iDeviceNTFS,
iDeviceNTFS_o,
+ iDeviceNTFS_XP,
+ iDeviceNTFS_XP_o,
iDeviceCDROM,
iDeviceCDROM_o,
@@ -165,6 +167,8 @@
{.name = "device_fat32_o", .image = NULL},
{.name = "device_ntfs", .image = NULL},
{.name = "device_ntfs_o", .image = NULL},
+ {.name = "device_ntfs_xp", .image = NULL},
+ {.name = "device_ntfs_xp_o", .image = NULL},
{.name = "device_cdrom", .image = NULL},
{.name = "device_cdrom_o", .image = NULL},
@@ -404,6 +408,8 @@
LOADPNG(device_fat32_o, iDeviceFAT32);
LOADPNG(device_ntfs, iDeviceGeneric);
LOADPNG(device_ntfs_o, iDeviceNTFS);
+ LOADPNG(device_ntfs_xp, iDeviceGeneric);
+ LOADPNG(device_ntfs_xp_o, iDeviceNTFS_XP);
LOADPNG(device_cdrom, iDeviceGeneric);
LOADPNG(device_cdrom_o, iDeviceCDROM);
@@ -925,7 +931,11 @@
}
case kPartitionTypeHPFS:
- devicetype = iDeviceNTFS; // Use HPFS / NTFS icon
+ if (!strcmp( device->label, "Windows XP")) {
+ devicetype = is_image_loaded(iDeviceNTFS_XP) ? iDeviceNTFS_XP : iDeviceGeneric; // Use Windows XP icon. Should revert to NTFS icon, but harder to spot error if we do so.
+ break;
+ }
+ devicetype = is_image_loaded(iDeviceNTFS) ? iDeviceNTFS : iDeviceGeneric; // Use HPFS / NTFS icon
break;
case kPartitionTypeFAT16:
@@ -1472,7 +1482,8 @@
if (pm && ((p.x + pm->width) < blendInto->width))
{
blend(pm, blendInto, p);
- return pos(p.x + pm->width, p.y);
+ // Custom kerning, -2 is a little over-kerned for some things, -1 is nice.
+ return pos(p.x + pm->width - 2, p.y);
}
else
return p;
@@ -2089,7 +2100,8 @@
drawCheckerBoard();
} else {
// Fill the background to 75% grey (same as BootX).
- drawColorRectangle(0, 0, screen_params[0], screen_params[1], 0x01);
+ // Disable the grey fill, so the screen can stay dark (for custom dark backgrounds)
+ // drawColorRectangle(0, 0, screen_params[0], screen_params[1], 0x01);
}
if ((bootImageData) && (usePngImage)) {
x = (screen_params[0] - MIN(bootImageWidth, screen_params[0])) / 2;
@@ -2117,3 +2129,4 @@
}
}
}
+/* vim: set ts=4 sts=0 sw=3 noet: */