m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the 'FX' button that didn't refresh its state when swapping pages between an image with Tilemap ON (button should be highlighted) and an image with Tilemap OFF (button not highlighted)

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1928 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud 2012-03-11 16:50:28 +00:00
parent 5af6f7bd4d
commit 145c9545e7
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/buttons.c
View File

@ -1498,7 +1498,7 @@ void Button_Skins(void)
state|=Main_magnifier_mode;
break;
case BUTTON_EFFECTS:
state|=(Shade_mode||Quick_shade_mode||Colorize_mode||Smooth_mode||Tiling_mode||Smear_mode||Stencil_mode||Mask_mode||Sieve_mode||Snap_mode);
state|=Any_effect_active();
break;
}
Draw_menu_button(button,state);
@ -1592,6 +1592,8 @@ void Button_Page(void)
Display_all_screen();
Unselect_button(BUTTON_PAGE);
Draw_menu_button(BUTTON_MAGNIFIER,Main_magnifier_mode);
// Tilemap mode might be different
Draw_menu_button(BUTTON_EFFECTS,Any_effect_active());
Display_menu();
Display_cursor();
@ -4815,7 +4817,7 @@ void Button_Effects(void)
else
Hide_cursor();
if (!(Shade_mode||Quick_shade_mode||Colorize_mode||Smooth_mode||Tiling_mode||Smear_mode||Stencil_mode||Mask_mode||Sieve_mode||Snap_mode||Main_tilemap_mode))
if (!Any_effect_active())
Unselect_button(BUTTON_EFFECTS);
Display_cursor();
@ -5527,3 +5529,8 @@ void Button_Brush_container(void)
//Unselect_button(BUTTON_PAINTBRUSHES);
Display_cursor();
}
byte Any_effect_active(void)
{
return Shade_mode||Quick_shade_mode||Colorize_mode||Smooth_mode||Tiling_mode||Smear_mode||Stencil_mode||Mask_mode||Sieve_mode||Snap_mode||Main_tilemap_mode;
}

2
src/buttons.h
View File

@ -680,5 +680,7 @@ byte Store_paintbrush(int index);
void Select_paintbrush(int index);
byte Any_effect_active(void);
#endif

3
src/engine.c
View File

@ -1327,8 +1327,7 @@ void Main_handler(void)
if (effect_modified)
{
Hide_cursor();
Draw_menu_button(BUTTON_EFFECTS,
(Shade_mode||Quick_shade_mode||Colorize_mode||Smooth_mode||Tiling_mode||Smear_mode||Stencil_mode||Mask_mode||Sieve_mode||Snap_mode));
Draw_menu_button(BUTTON_EFFECTS, Any_effect_active());
Display_cursor();
}
}