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

Implemented palette ordering (issue 112). You can activate it in the secondary palette window (shift-P), it's saved in gfx2.ini.

Browse Source 
The skin file has 2 more icons for the arrows (Ilija, grafx2 won't load if you don't update yours)
Updated contextual help for the secondary palette window.
Fixed some typos in code.

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@704 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud
2009-03-29 21:58:38 +00:00
parent eb781b9bd6
commit 8ff9028eab
14 changed files with 233 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
buttons.c
View File

@@ -234,13 +234,14 @@ void Button_Redo(void)
//---------------------------- SCROLL PALETTE LEFT ---------------------------
void Button_Pal_left(void)
{
short cells_y = Palette_cells_Y();
short cells;
cells = (Config.Palette_vertical)?Palette_cells_X():Palette_cells_Y();
Hide_cursor();
if (First_color_in_palette)
{
if (First_color_in_palette>=cells_y)
First_color_in_palette-=cells_y;
if (First_color_in_palette>=cells)
First_color_in_palette-=cells;
else
First_color_in_palette=0;
Display_menu_palette();
@@ -251,14 +252,14 @@ void Button_Pal_left(void)
void Button_Pal_left_fast(void)
{
short cells_X = Palette_cells_X();
short cells_x = Palette_cells_X();
short cells_y = Palette_cells_Y();
Hide_cursor();
if (First_color_in_palette)
{
if (First_color_in_palette>=cells_y*cells_X)
First_color_in_palette-=cells_y*cells_X;
if (First_color_in_palette>=cells_y*cells_x)
First_color_in_palette-=cells_y*cells_x;
else
First_color_in_palette=0;
Display_menu_palette();
@@ -271,30 +272,32 @@ void Button_Pal_left_fast(void)
//--------------------------- SCROLL PALETTE RIGHT ---------------------------
void Button_Pal_right(void)
{
short cells_y = Palette_cells_Y();
short cells;
cells = (Config.Palette_vertical)?Palette_cells_X():Palette_cells_Y();
Hide_cursor();
if ((int)First_color_in_palette+cells_y*Palette_cells_X()<256)
if ((int)First_color_in_palette+Palette_cells_X()*Palette_cells_Y()<256)
{
First_color_in_palette+=cells_y;
First_color_in_palette+=cells;
Display_menu_palette();
}
Unselect_bouton(BUTTON_PAL_RIGHT);
Display_cursor();
}
void Button_Pal_right_fast(void)
{
short cells_X = Palette_cells_X();
short cells_x = Palette_cells_X();
short cells_y = Palette_cells_Y();
Hide_cursor();
if ((int)First_color_in_palette+cells_y*cells_X<256)
if ((int)First_color_in_palette+cells_y*cells_x<256)
{
if ((int)First_color_in_palette+(cells_y)*cells_X*2<256)
First_color_in_palette+=cells_X*cells_y;
if ((int)First_color_in_palette+(cells_y)*cells_x*2<256)
First_color_in_palette+=cells_x*cells_y;
else
First_color_in_palette=255/cells_y*cells_y-(cells_X-1)*cells_y;
First_color_in_palette=255/cells_y*cells_y-(cells_x-1)*cells_y;
Display_menu_palette();
}
Unselect_bouton(BUTTON_PAL_RIGHT);