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

Changed icon highlight to flashing aqua

Browse Source
This commit is contained in:
Adubbz 2018-02-24 14:23:06 +11:00 committed by plutoo
parent 8d8a5c8e12
commit f23f133404
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.pc
View File

@ -15,7 +15,7 @@ test : pc_main/main.cpp pc_main/pc_launch.c \
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/switchicon_questionmark.bin.o build_pc/folder_icon.bin.o \
build_pc/button_a_light.bin.o build_pc/button_a_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/hbmenu_logo_light.bin.o build_pc/hbmenu_logo_dark.bin.o
gcc -Wall -O2 -g0 $^ -lsfml-graphics -lsfml-window -lsfml-system -lstdc++ -I. -Ibuild_pc -o $@ gcc -Wall -O2 -g0 $^ -lsfml-graphics -lsfml-window -lsfml-system -lstdc++ -lm -I. -Ibuild_pc -o $@
build_pc/tahoma12.o : data/tahoma12.nxfnt build_pc/tahoma12.o : data/tahoma12.nxfnt
mkdir -p $(dir $@) mkdir -p $(dir $@)

8
common/menu.c
View File

@ -47,6 +47,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 *switchicon_questionmark_small;
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) {
int x, y; int x, y;
@ -67,10 +68,13 @@ static void drawEntry(menuEntry_s* me, int off_x, int is_active) {
int shadow_inset; int shadow_inset;
color_t shadow_color; color_t shadow_color;
uint8_t shadow_alpha_base = 80; uint8_t shadow_alpha_base = 80;
float highlight_multiplier, highlight_mod;
int shadow_size = 4; int shadow_size = 4;
if (is_active) { if (is_active) {
border_color = themeCurrent.highlightColor; highlight_mod = timer - 1.0 * (int)(timer / 1.0);
highlight_multiplier = fmax(0.0, fabs(highlight_mod - 0.5) / 0.5);
border_color = MakeColor(themeCurrent.highlightColor.r + (255 - themeCurrent.highlightColor.r) * highlight_multiplier, themeCurrent.highlightColor.g + (255 - themeCurrent.highlightColor.g) * highlight_multiplier, themeCurrent.highlightColor.b + (255 - themeCurrent.highlightColor.b) * highlight_multiplier, 255);
border_start_x = start_x-5; border_start_x = start_x-5;
border_end_x = end_x+5; border_end_x = end_x+5;
border_start_y = start_y-5; border_start_y = start_y-5;
@ -223,8 +227,6 @@ color_t waveBlendAdd(color_t a, color_t b, float alpha) {
return MakeColor(a.r+(b.r*alpha), a.g+b.g*alpha, a.b + b.b*alpha, 255); return MakeColor(a.r+(b.r*alpha), a.g+b.g*alpha, a.b + b.b*alpha, 255);
} }
double timer;
void drawWave(float timer, color_t color, float height, float phase, float speed) { void drawWave(float timer, color_t color, float height, float phase, float speed) {
int x, y; int x, y;
float wave_top_y, alpha; float wave_top_y, alpha;

4
common/theme.c
View File

@ -13,7 +13,7 @@ void themeStartup(ThemePreset preset) {
middleWaveColor: MakeColor(100, 153, 255, 255), middleWaveColor: MakeColor(100, 153, 255, 255),
backWaveColor: MakeColor(154, 171, 255, 255), backWaveColor: MakeColor(154, 171, 255, 255),
backgroundColor: MakeColor(233, 236, 241, 255), backgroundColor: MakeColor(233, 236, 241, 255),
highlightColor: MakeColor(129, 137, 236, 255), highlightColor: MakeColor(91, 237, 224, 255),
enableWaveBlending: 0, enableWaveBlending: 0,
buttonAImage: button_a_light_bin, buttonAImage: button_a_light_bin,
hbmenuLogoImage: hbmenu_logo_light_bin hbmenuLogoImage: hbmenu_logo_light_bin
@ -27,7 +27,7 @@ void themeStartup(ThemePreset preset) {
middleWaveColor: MakeColor(66, 154, 159, 255), middleWaveColor: MakeColor(66, 154, 159, 255),
backWaveColor: MakeColor(73, 103, 169, 255), backWaveColor: MakeColor(73, 103, 169, 255),
backgroundColor: MakeColor(45, 45, 50, 255), backgroundColor: MakeColor(45, 45, 50, 255),
highlightColor: MakeColor(129, 137, 236, 255), highlightColor: MakeColor(91, 237, 224, 255),
enableWaveBlending: 0, enableWaveBlending: 0,
buttonAImage: button_a_dark_bin, buttonAImage: button_a_dark_bin,
hbmenuLogoImage: hbmenu_logo_dark_bin hbmenuLogoImage: hbmenu_logo_dark_bin