diff options
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 3 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_windowmanager_types.h | 13 |
2 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 382fd8c1dbd..769e2573aa4 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -540,7 +540,8 @@ typedef struct UserDef { * a drag/release pie menu */ short pie_initial_timeout; /* direction in the pie menu will always be calculated from the initial position * within this time limit */ - int pie_animation_timeout; + short pie_animation_timeout; + short pie_menu_confirm; short pie_menu_radius; /* pie menu radius */ short pie_menu_threshold; /* pie menu distance from center before a direction is set */ diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h index a17e416b5bd..4cf6bfe9a8f 100644 --- a/source/blender/makesdna/DNA_windowmanager_types.h +++ b/source/blender/makesdna/DNA_windowmanager_types.h @@ -171,11 +171,6 @@ typedef struct wmWindow { void *ghostwin; /* don't want to include ghost.h stuff */ - int winid; /* winid also in screens, is for retrieving this window after read */ - - short grabcursor; /* cursor grab mode */ - short pad; - struct bScreen *screen; /* active screen */ struct bScreen *newscreen; /* temporary when switching */ char screenname[64]; /* MAX_ID_NAME for matching window with active screen after file read */ @@ -187,8 +182,14 @@ typedef struct wmWindow { short cursor; /* current mouse cursor type */ short lastcursor; /* previous cursor when setting modal one */ short modalcursor; /* the current modal cursor */ + short grabcursor; /* cursor grab mode */ short addmousemove; /* internal: tag this for extra mousemove event, makes cursors/buttons active on UI switching */ - short pad2; + + int winid; /* winid also in screens, is for retrieving this window after read */ + + short lock_pie_event; /* internal, lock pie creation from this event until released */ + short last_pie_event; /* exception to the above rule for nested pies, store last pie event for operators + * that spawn a new pie right after destruction of last pie */ struct wmEvent *eventstate; /* storage for event system */ |