Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormano-wii <germano.costa@ig.com.br>2018-01-19 09:14:27 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-01-19 09:15:45 +0300
commitebf01d44ee0e034da169efc0aca81f99966ebde6 (patch)
treeb9b93e24af4c60ec8d296bc0c1590a20e5c08020 /source/blender/makesdna
parent7a24e0d175827824d139f7627de2a5af34d687fb (diff)
WM: window draw callbacks and split preview snap
This moves window overlay from hard coded flags into drawing callbacks. It also supports snapping (holding Ctrl).
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_screen_types.h8
-rw-r--r--source/blender/makesdna/DNA_windowmanager_types.h3
2 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h
index fd63d7c471c..a33aad4f343 100644
--- a/source/blender/makesdna/DNA_screen_types.h
+++ b/source/blender/makesdna/DNA_screen_types.h
@@ -280,11 +280,11 @@ typedef struct ARegion {
/* area->flag */
enum {
HEADER_NO_PULLDOWN = (1 << 0),
- AREA_FLAG_DRAWJOINTO = (1 << 1),
- AREA_FLAG_DRAWJOINFROM = (1 << 2),
+// AREA_FLAG_DEPRECATED_1 = (1 << 1),
+// AREA_FLAG_DEPRECATED_2 = (1 << 2),
AREA_TEMP_INFO = (1 << 3),
- AREA_FLAG_DRAWSPLIT_H = (1 << 4),
- AREA_FLAG_DRAWSPLIT_V = (1 << 5),
+// AREA_FLAG_DEPRECATED_4 = (1 << 4),
+// AREA_FLAG_DEPRECATED_5 = (1 << 5),
/* used to check if we should switch back to prevspace (of a different type) */
AREA_FLAG_TEMP_TYPE = (1 << 6),
/* for temporary fullscreens (file browser, image editor render) that are opened above user set fullscreens */
diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h
index 16116036e86..06185a583bb 100644
--- a/source/blender/makesdna/DNA_windowmanager_types.h
+++ b/source/blender/makesdna/DNA_windowmanager_types.h
@@ -220,6 +220,9 @@ typedef struct wmWindow {
ListBase gesture; /* gesture stuff */
struct Stereo3dFormat *stereo3d_format; /* properties for stereoscopic displays */
+
+ /* custom drawing callbacks */
+ ListBase drawcalls;
} wmWindow;
#ifdef ime_data