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

Use separate operation-before storage for panning

Browse Source 
This allows fast panning to be interrupt interrupting operations, like
color pick and click-zoom
This commit is contained in:
Philip Linde 2018-06-01 02:09:59 +00:00 committed by Philip Linde
parent b8dbbf77fe
commit 0936118568
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/operatio.c
View File

@ -49,6 +49,10 @@
/// for discontinuous freehand drawing. /// for discontinuous freehand drawing.
Uint32 Airbrush_next_time; Uint32 Airbrush_next_time;
// Panning needs its own operation storage because it may interrupt another
// interrupting operation
static enum OPERATIONS Operation_before_pan;
void Start_operation_stack(word new_operation) void Start_operation_stack(word new_operation)
{ {
// This part handles things that must be done when exiting an operation. // This part handles things that must be done when exiting an operation.
@ -72,11 +76,16 @@ void Start_operation_stack(word new_operation)
case OPERATION_GRAB_BRUSH: case OPERATION_GRAB_BRUSH:
case OPERATION_POLYBRUSH: case OPERATION_POLYBRUSH:
case OPERATION_STRETCH_BRUSH: case OPERATION_STRETCH_BRUSH:
case OPERATION_PAN_VIEW:
Operation_before_interrupt=Current_operation; Operation_before_interrupt=Current_operation;
// On passe à l'operation demandée // On passe à l'operation demandée
Current_operation=new_operation; Current_operation=new_operation;
break; break;
case OPERATION_PAN_VIEW:
// Use separate operation-before storage for panning
Operation_before_pan=Current_operation;
// On passe à l'operation demandée
Current_operation=new_operation;
break;
case OPERATION_ROTATE_BRUSH: case OPERATION_ROTATE_BRUSH:
Begin_brush_rotation(); Begin_brush_rotation();
Operation_before_interrupt=Current_operation; Operation_before_interrupt=Current_operation;
@ -4089,7 +4098,7 @@ void Pan_view_0_0(void)
{ {
// End of operation, return to previous // End of operation, return to previous
Hide_cursor(); Hide_cursor();
Start_operation_stack(Operation_before_interrupt); Start_operation_stack(Operation_before_pan);
Display_cursor(); Display_cursor();
} }
} }
@ -4160,7 +4169,7 @@ void Pan_view_0_2(void)
{ {
// End of operation, return to previous // End of operation, return to previous
Hide_cursor(); Hide_cursor();
Start_operation_stack(Operation_before_interrupt); Start_operation_stack(Operation_before_pan);
Display_cursor(); Display_cursor();
} }
} }