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

(layers branch) Adjust tool implemented. Left click and drag to move a single layer, Right-click and drag to move everything.

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/layers@1041 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud
2009-09-22 22:55:02 +00:00
parent cedb706326
commit 78e59e6127
7 changed files with 88 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
operatio.c
View File

@@ -3914,6 +3914,8 @@ void Scroll_12_0(void)
Operation_push(Paintbrush_Y);
Operation_push(Paintbrush_X);
Operation_push(Paintbrush_Y);
Operation_push(Mouse_K); // LEFT_SIDE or RIGHT_SIDE
Cursor_hidden_before_scroll=Cursor_hidden;
Cursor_hidden=1;
if ((Config.Coords_rel) && (Menu_is_visible))
@@ -3921,11 +3923,11 @@ void Scroll_12_0(void)
}
void Scroll_12_4(void)
void Scroll_12_5(void)
//
// Opération : OPERATION_SCROLL
// Click Souris: 1 ou 2
// Taille_Pile : 4
// Taille_Pile : 5
//
// Souris effacée: Non
//
@@ -3936,8 +3938,10 @@ void Scroll_12_4(void)
short y_pos;
short x_offset;
short y_offset;
short side;
//char str[5];
Operation_pop(&side);
Operation_pop(&y_pos);
Operation_pop(&x_pos);
Operation_pop(&center_y);
@@ -3959,7 +3963,17 @@ void Scroll_12_4(void)
Display_coords_rel_or_abs(center_x,center_y);
Scroll_picture(x_offset,y_offset);
if (side == RIGHT_SIDE)
{
// All layers at once
Scroll_picture(Screen_backup, Main_screen, x_offset,y_offset);
}
else
{
// One layer at once
Scroll_picture(Main_backups->Pages->Next->Image[Main_current_layer], Main_backups->Pages->Image[Main_current_layer], x_offset, y_offset);
Redraw_layered_image();
}
Display_all_screen();
}
@@ -3968,19 +3982,60 @@ void Scroll_12_4(void)
Operation_push(center_y);
Operation_push(Paintbrush_X);
Operation_push(Paintbrush_Y);
Operation_push(side);
}
void Scroll_0_4(void)
void Scroll_0_5(void)
//
// Opération : OPERATION_SCROLL
// Click Souris: 0
// Taille_Pile : 4
// Taille_Pile : 5
//
// Souris effacée: Oui
//
{
Operation_stack_size-=4;
// All layers at once
short center_x;
short center_y;
short x_pos;
short y_pos;
short x_offset;
short y_offset;
short side;
int i;
Operation_pop(&side);
Operation_pop(&y_pos);
Operation_pop(&x_pos);
Operation_pop(&center_y);
Operation_pop(&center_x);
if (side == RIGHT_SIDE)
{
// All layers at once
if (x_pos>=center_x)
x_offset=(x_pos-center_x)%Main_image_width;
else
x_offset=Main_image_width-((center_x-x_pos)%Main_image_width);
if (y_pos>=center_y)
y_offset=(y_pos-center_y)%Main_image_height;
else
y_offset=Main_image_height-((center_y-y_pos)%Main_image_height);
// Do the actual scroll operation on all layers.
for (i=0; i<NB_LAYERS; i++)
Scroll_picture(Main_backups->Pages->Next->Image[i], Main_backups->Pages->Image[i], x_offset, y_offset);
}
else
{
// One layer : everything was done while dragging the mouse
}
Cursor_hidden=Cursor_hidden_before_scroll;
End_of_modification();
if ((Config.Coords_rel) && (Menu_is_visible))
{