mika/nx-hbmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed switchicon_questionmark to invalid_icon

Browse Source
This commit is contained in:
Adubbz 2018-02-25 10:54:21 +11:00 committed by plutoo
parent 538b760644
commit 5e95934cb6
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.pc
View File

@ -13,7 +13,7 @@ test : pc_main/main.cpp pc_main/pc_launch.c \
common/nanojpeg.c common/ui.c common/math.c common/theme.c \ common/nanojpeg.c common/ui.c common/math.c common/theme.c \
build_pc/tahoma24.o build_pc/tahoma12.o build_pc/interuimedium20.o build_pc/interuimedium30.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 \ build_pc/interuiregular14.o build_pc/interuiregular18.o \
build_pc/switchicon_questionmark.bin.o build_pc/folder_icon.bin.o \ build_pc/invalid_icon.bin.o build_pc/folder_icon.bin.o \
build_pc/button_a_light.bin.o build_pc/button_a_dark.bin.o build_pc/button_b_light.bin.o build_pc/button_b_dark.bin.o build_pc/hbmenu_logo_light.bin.o build_pc/hbmenu_logo_dark.bin.o build_pc/button_a_light.bin.o build_pc/button_a_dark.bin.o build_pc/button_b_light.bin.o build_pc/button_b_dark.bin.o build_pc/hbmenu_logo_light.bin.o build_pc/hbmenu_logo_dark.bin.o
gcc -Wall -O2 -g0 $^ -lsfml-graphics -lsfml-window -lsfml-system -lstdc++ -lm -I. -Ibuild_pc -o $@ gcc -Wall -O2 -g0 $^ -lsfml-graphics -lsfml-window -lsfml-system -lstdc++ -lm -I. -Ibuild_pc -o $@
@ -47,7 +47,7 @@ build_pc/interuiregular18.o : data/interuiregular18.nxfnt
@echo $(notdir $<) @echo $(notdir $<)
@$(bin2o) @$(bin2o)
build_pc/switchicon_questionmark.bin.o : data/switchicon_questionmark.bin build_pc/invalid_icon.bin.o : data/invalid_icon.bin
mkdir -p $(dir $@) mkdir -p $(dir $@)
@echo $(notdir $<) @echo $(notdir $<)
@$(bin2o) @$(bin2o)

10
common/menu.c
View File

@ -1,7 +1,7 @@
#include <time.h> #include <time.h>
#include "common.h" #include "common.h"
#include "switchicon_questionmark_bin.h" #include "invalid_icon_bin.h"
#include "folder_icon_bin.h" #include "folder_icon_bin.h"
void launchMenuEntryTask(menuEntry_s* arg) void launchMenuEntryTask(menuEntry_s* arg)
@ -46,7 +46,7 @@ static void drawImage(int x, int y, int width, int height, const uint8_t *image,
} }
uint8_t *folder_icon_small; uint8_t *folder_icon_small;
uint8_t *switchicon_questionmark_small; uint8_t *invalid_icon_small;
double timer; double timer;
static void drawEntry(menuEntry_s* me, int off_x, int is_active) { static void drawEntry(menuEntry_s* me, int off_x, int is_active) {
@ -155,8 +155,8 @@ static void drawEntry(menuEntry_s* me, int off_x, int is_active) {
largeimg = folder_icon_bin; largeimg = folder_icon_bin;
} }
else { else {
smallimg = switchicon_questionmark_small; smallimg = invalid_icon_small;
largeimg = switchicon_questionmark_bin; largeimg = invalid_icon_bin;
} }
if (smallimg) { if (smallimg) {
@ -220,7 +220,7 @@ void menuStartup() {
menuScan(path); menuScan(path);
folder_icon_small = downscaleIcon(folder_icon_bin); folder_icon_small = downscaleIcon(folder_icon_bin);
switchicon_questionmark_small = downscaleIcon(switchicon_questionmark_bin); invalid_icon_small = downscaleIcon(invalid_icon_bin);
} }
color_t waveBlendAdd(color_t a, color_t b, float alpha) { color_t waveBlendAdd(color_t a, color_t b, float alpha) {

0
data/switchicon_questionmark.bin → data/invalid_icon.bin
View File

0
resources/switchicon-questionmark.png → resources/invalid_icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB