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

Fix issue 539 : Freeze when palette is 'vertical' and number of rows is not a power of two

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@2064 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud 2013-08-30 00:05:47 +00:00
parent 01543b7a8d
commit 365cc8d50b
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/buttons.c
View File

@ -333,7 +333,12 @@ void Button_Pal_right_fast(void)
if ((int)First_color_in_palette+(cells_y)*cells_x*2<256) if ((int)First_color_in_palette+(cells_y)*cells_x*2<256)
First_color_in_palette+=cells_x*cells_y; First_color_in_palette+=cells_x*cells_y;
else else
First_color_in_palette=255/cells_y*cells_y-(cells_x-1)*cells_y; {
if (Config.Palette_vertical)
First_color_in_palette=255/cells_x*cells_x-(cells_y-1)*cells_x;
else
First_color_in_palette=255/cells_y*cells_y-(cells_x-1)*cells_y;
}
Display_menu_palette(); Display_menu_palette();
} }
Unselect_button(BUTTON_PAL_RIGHT); Unselect_button(BUTTON_PAL_RIGHT);

9
src/windows.c
View File

@ -422,8 +422,13 @@ void Change_palette_cells()
// la fin, il faut reculer First_color_in_palette pour montrer plein // la fin, il faut reculer First_color_in_palette pour montrer plein
// de couleurs. // de couleurs.
if ((int)First_color_in_palette+(Menu_cells_Y)*Menu_cells_X*2>=256) if ((int)First_color_in_palette+(Menu_cells_Y)*Menu_cells_X*2>=256)
First_color_in_palette=255/Menu_cells_Y*Menu_cells_Y-(Menu_cells_X-1)*Menu_cells_Y; {
if (Config.Palette_vertical)
First_color_in_palette=255/Menu_cells_X*Menu_cells_X-(Menu_cells_Y-1)*Menu_cells_X;
else
First_color_in_palette=255/Menu_cells_Y*Menu_cells_Y-(Menu_cells_X-1)*Menu_cells_Y;
}
// Mise à jour de la taille du bouton dans le menu. C'est pour pas que // Mise à jour de la taille du bouton dans le menu. C'est pour pas que
// la bordure noire soit active. // la bordure noire soit active.
Buttons_Pool[BUTTON_CHOOSE_COL].Width=(Menu_palette_cell_width*Menu_cells_X)-1; Buttons_Pool[BUTTON_CHOOSE_COL].Width=(Menu_palette_cell_width*Menu_cells_X)-1;