diff --git a/Makefile.pc b/Makefile.pc index 78a9870..dad81b1 100644 --- a/Makefile.pc +++ b/Makefile.pc @@ -26,7 +26,7 @@ test : pc_main/main.cpp pc_main/pc_launch.c \ build_pc/invalid_icon.bin.o build_pc/folder_icon.bin.o \ build_pc/hbmenu_logo_light.bin.o build_pc/hbmenu_logo_dark.bin.o \ build_pc/theme_icon_dark.bin.o build_pc/theme_icon_light.bin.o \ - build_pc/charging_icon.bin.o \ + build_pc/charging_icon.bin.o build_pc/battery_icon.bin.o \ #build_pc/tahoma24.o build_pc/tahoma12.o build_pc/interuimedium20.o build_pc/interuimedium30.o build_pc/interuiregular14.o build_pc/interuiregular18.o gcc -Wall -O2 -g -DVERSION=\"v$(APP_VERSION)\" $(EXTRA_CFLAGS) `pkg-config freetype2 --cflags` $^ -lsfml-graphics -lsfml-window -lsfml-system -lstdc++ `pkg-config freetype2 --libs` -lm -lz -lconfig -lturbojpeg $(EXTRA_LDFLAGS) -I. -iquote $(DEVKITPRO)/libnx/include -Ibuild_pc -g -o $@ @@ -95,6 +95,11 @@ build_pc/charging_icon.bin.o : data/charging_icon.bin @echo $(notdir $<) @$(bin2o) +build_pc/battery_icon.bin.o : data/battery_icon.bin + mkdir -p $(dir $@) + @echo $(notdir $<) + @$(bin2o) + clean: rm -rf build_pc/ test test.* diff --git a/common/menu.c b/common/menu.c index 31657fa..c6b61b2 100644 --- a/common/menu.c +++ b/common/menu.c @@ -337,9 +337,6 @@ void menuStartupPath(void) { } } -uint8_t *charging_icon_small; -uint8_t *battery_icon_small; - void menuStartup(void) { menuScan(rootPath); @@ -349,8 +346,6 @@ void menuStartup(void) { theme_icon_small = downscaleImg(theme_icon_dark_bin, 256, 256, 140, 140, IMAGE_MODE_RGB24); else theme_icon_small = downscaleImg(theme_icon_light_bin, 256, 256, 140, 140, IMAGE_MODE_RGB24); - charging_icon_small = downscaleImg(charging_icon_bin, 155, 256, 9, 15, IMAGE_MODE_RGBA32); - battery_icon_small = downscaleImg(battery_icon_bin, 175, 256, 10, 15, IMAGE_MODE_RGBA32); computeFrontGradient(themeCurrent.frontWaveColor, 280); //menuCreateMsgBox(780, 300, "This is a test"); } @@ -441,9 +436,9 @@ void drawCharge() { int tmpX = GetTextXCoordinate(interuiregular14, 1180, chargeString, 'r'); DrawText(interuiregular14, tmpX - 15, 0 + 47 + 10 + 21, themeCurrent.textColor, chargeString); - drawIcon(1180 - 11, 0 + 47 + 10 + 6, 10, 15, battery_icon_small, themeCurrent.textColor); + drawIcon(1180 - 11, 0 + 47 + 10 + 6, 10, 15, battery_icon_bin, themeCurrent.textColor); if (isCharging) - drawIcon(tmpX - 35, 0 + 47 + 10 + 5, 9, 15, charging_icon_small, themeCurrent.textColor); + drawIcon(tmpX - 32, 0 + 47 + 10 + 6, 9, 15, charging_icon_bin, themeCurrent.textColor); } void drawBackBtn(menu_s* menu, bool emptyDir) { diff --git a/data/battery_icon.bin b/data/battery_icon.bin index 651b502..75936fa 100644 Binary files a/data/battery_icon.bin and b/data/battery_icon.bin differ diff --git a/data/charging_icon.bin b/data/charging_icon.bin index ea98019..634fb12 100644 Binary files a/data/charging_icon.bin and b/data/charging_icon.bin differ diff --git a/resources/battery_icon.png b/resources/battery_icon.png index a33daaa..5c89f72 100644 Binary files a/resources/battery_icon.png and b/resources/battery_icon.png differ diff --git a/resources/charging_icon.png b/resources/charging_icon.png index 279b089..2229590 100644 Binary files a/resources/charging_icon.png and b/resources/charging_icon.png differ