diff options
Diffstat (limited to 'source/blender/makesdna/DNA_userdef_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 118 |
1 files changed, 81 insertions, 37 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 314ca1dfaa9..c24895e3640 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -131,6 +131,8 @@ typedef struct uiWidgetColors { short shaded; short shadetop, shadedown; short alpha_check; + float roundness; + float pad; } uiWidgetColors; typedef struct uiWidgetStateColors { @@ -140,15 +142,17 @@ typedef struct uiWidgetStateColors { char inner_key_sel[4]; char inner_driven[4]; char inner_driven_sel[4]; + char inner_overridden[4]; + char inner_overridden_sel[4]; float blend, pad; } uiWidgetStateColors; typedef struct uiPanelColors { char header[4]; char back[4]; + char sub_back[4]; short show_header; short show_back; - int pad; } uiPanelColors; typedef struct uiGradientColors { @@ -160,9 +164,9 @@ typedef struct uiGradientColors { typedef struct ThemeUI { /* Interface Elements (buttons, menus, icons) */ - uiWidgetColors wcol_regular, wcol_tool, wcol_text; + uiWidgetColors wcol_regular, wcol_tool, wcol_toolbar_item, wcol_text; uiWidgetColors wcol_radio, wcol_option, wcol_toggle; - uiWidgetColors wcol_num, wcol_numslider; + uiWidgetColors wcol_num, wcol_numslider, wcol_tab; uiWidgetColors wcol_menu, wcol_pulldown, wcol_menu_back, wcol_menu_item, wcol_tooltip; uiWidgetColors wcol_box, wcol_scroll, wcol_progress, wcol_list_item, wcol_pie_menu; @@ -176,13 +180,24 @@ typedef struct ThemeUI { float menu_shadow_fac; short menu_shadow_width; - short pad[3]; + char editor_outline[4]; + short pad[1]; char iconfile[256]; // FILE_MAXFILE length float icon_alpha; + float icon_saturation; + char _pad[4]; /* Axis Colors */ char xaxis[4], yaxis[4], zaxis[4]; + + /* Manipulator Colors. */ + char manipulator_hi[4]; + char manipulator_primary[4]; + char manipulator_secondary[4]; + char manipulator_a[4]; + char manipulator_b[4]; + char pad2[4]; } ThemeUI; /* try to put them all in one, if needed a special struct can be created as well @@ -387,10 +402,11 @@ typedef struct bTheme { ThemeSpace toops; ThemeSpace ttime; ThemeSpace tnode; - ThemeSpace tlogic; ThemeSpace tuserpref; ThemeSpace tconsole; ThemeSpace tclip; + ThemeSpace ttopbar; + ThemeSpace tstatusbar; /* 20 sets of bone colors for this theme */ ThemeWireColor tarm[20]; @@ -414,6 +430,36 @@ typedef struct bPathCompare { char flag, pad[7]; } bPathCompare; +typedef struct bUserMenu { + struct bUserMenu *next, *prev; + char space_type; + char _pad0[7]; + char context[64]; + /* bUserMenuItem */ + ListBase items; +} bUserMenu; + +/* May be part of bUserMenu or other list. */ +typedef struct bUserMenuItem { + struct bUserMenuItem *next, *prev; + char ui_name[64]; + char type; + char _pad0[7]; +} bUserMenuItem; + +typedef struct bUserMenuItem_Op { + bUserMenuItem item; + char opname[64]; + struct IDProperty *prop; + char opcontext; + char _pad0[7]; +} bUserMenuItem_Op; + +enum { + USER_MENU_TYPE_SEP = 1, + USER_MENU_TYPE_OPERATOR = 2, +}; + typedef struct SolidLight { int flag, pad; float col[4], spec[4], vec[4]; @@ -456,7 +502,7 @@ typedef struct UserDef { short versions; short dbl_click_time; - short gameflags; + short pad; short wheellinescroll; int uiflag; /* eUserpref_UI_Flag */ int uiflag2; /* eUserpref_UI_Flag2 */ @@ -472,12 +518,16 @@ typedef struct UserDef { int audioformat; int audiochannels; + float ui_scale; /* setting for UI scale */ + int ui_line_width; /* setting for UI line width */ + int dpi; /* runtime, full DPI divided by pixelsize */ + float dpi_fac; /* runtime, multiplier to scale UI elements based on DPI */ + float pixelsize; /* runtime, line width and point size based on DPI */ + int virtual_pixel; /* deprecated, for forward compatibility */ + int scrollback; /* console scrollback limit */ - int dpi; /* range 48-128? */ - float ui_scale; /* interface scale */ - int ui_line_width; /* interface line width */ char node_margin; /* node insert offset (aka auto-offset) margin, but might be useful for later stuff as well */ - char pad2; + char pad2[5]; short transopts; /* eUserpref_Translation_Flags */ short menuthreshold1, menuthreshold2; @@ -491,6 +541,8 @@ typedef struct UserDef { struct ListBase user_keymaps; struct ListBase addons; struct ListBase autoexec_paths; + struct ListBase user_menus; /* bUserMenu */ + char keyconfigstr[64]; short undosteps; @@ -501,14 +553,14 @@ typedef struct UserDef { short gp_settings; /* eGP_UserdefSettings */ short tb_leftmouse, tb_rightmouse; struct SolidLight light[3]; - short tw_hotspot, tw_flag, tw_handlesize, tw_size; + short manipulator_flag, manipulator_size; + short pad6[3]; short textimeout, texcollectrate; - short wmdrawmethod; /* eWM_DrawMethod */ short dragthreshold; int memcachelimit; int prefetchframes; float pad_rot_angle; /* control the rotation step of the view when PAD2, PAD4, PAD6&PAD8 is use */ - short frameserverport; + short _pad0; short obcenter_dia; short rvisize; /* rotating view icon size */ short rvibright; /* rotating view icon brightness */ @@ -521,7 +573,7 @@ typedef struct UserDef { char keyhandles_new; /* handle types for newly added keyframes */ char gpu_select_method; char gpu_select_pick_deph; - char pad4; + char gpu_viewport_antialias; char view_frame_type; /* eZoomFrame_Mode */ int view_frame_keyframes; /* number of keyframes to zoom around current frame */ @@ -557,7 +609,7 @@ typedef struct UserDef { float gpencil_new_layer_col[4]; /* default color for newly created Grease Pencil layers */ short tweak_threshold; - char navigation_mode, pad; + char navigation_mode, pad10; char author[80]; /* author name for file formats supporting it */ @@ -568,8 +620,6 @@ typedef struct UserDef { int compute_device_id; float fcu_inactive_alpha; /* opacity of inactive F-Curves in F-Curve Editor */ - float pixelsize; /* private, set by GHOST, to multiply DPI with */ - int virtual_pixel; /* virtual pixelsize mode */ short pie_interaction_type; /* if keeping a pie menu spawn button pressed after this time, it turns into * a drag/release pie menu */ @@ -599,6 +649,7 @@ typedef enum eUserPref_Section { USER_SECTION_THEME = 4, USER_SECTION_INPUT = 5, USER_SECTION_ADDONS = 6, + USER_SECTION_LIGHT = 7, } eUserPref_Section; /* UserDef.flag */ @@ -607,7 +658,7 @@ typedef enum eUserPref_Flag { USER_FLAG_DEPRECATED_1 = (1 << 1), /* cleared */ USER_FLAG_DEPRECATED_2 = (1 << 2), /* cleared */ USER_FLAG_DEPRECATED_3 = (1 << 3), /* cleared */ - USER_SCENEGLOBAL = (1 << 4), +/* USER_SCENEGLOBAL = (1 << 4), deprecated */ USER_TRACKBALL = (1 << 5), USER_FLAG_DEPRECATED_6 = (1 << 6), /* cleared */ USER_FLAG_DEPRECATED_7 = (1 << 7), /* cleared */ @@ -677,7 +728,7 @@ typedef enum eUserpref_UI_Flag { USER_MENUOPENAUTO = (1 << 9), USER_DEPTH_CURSOR = (1 << 10), USER_AUTOPERSP = (1 << 11), - USER_LOCKAROUND = (1 << 12), + /* USER_LOCKAROUND = (1 << 12), */ /* DEPRECATED */ USER_GLOBALUNDO = (1 << 13), USER_ORBIT_SELECTION = (1 << 14), USER_DEPTH_NAVIGATE = (1 << 15), @@ -776,15 +827,6 @@ typedef enum eDupli_ID_Flags { USER_DUP_PSYS = (1 << 11) } eDupli_ID_Flags; -/* UserDef.gameflags */ -typedef enum eOpenGL_RenderingOptions { - USER_GL_RENDER_DEPRECATED_0 = (1 << 0), - USER_GL_RENDER_DEPRECATED_1 = (1 << 1), - USER_DISABLE_MIPMAP = (1 << 2), - USER_GL_RENDER_DEPRECATED_3 = (1 << 3), - USER_GL_RENDER_DEPRECATED_4 = (1 << 4), -} eOpenGL_RenderingOptions; - /* selection method for opengl gpu_select_method */ typedef enum eOpenGL_SelectOptions { USER_SELECT_AUTO = 0, @@ -792,15 +834,11 @@ typedef enum eOpenGL_SelectOptions { USER_SELECT_USE_SELECT_RENDERMODE = 2 } eOpenGL_SelectOptions; -/* wm draw method. - * UserDef.wmdrawmethod */ -typedef enum eWM_DrawMethod { - USER_DRAW_TRIPLE = 0, - USER_DRAW_OVERLAP = 1, - USER_DRAW_FULL = 2, - USER_DRAW_AUTOMATIC = 3, - USER_DRAW_OVERLAP_FLIP = 4, -} eWM_DrawMethod; +/* max anti alias draw method UserDef.gpu_viewport_antialias */ +typedef enum eOpenGL_AntiAliasMethod { + USER_AA_NONE = 0, + USER_AA_FXAA = 1, +} eOpenGL_AntiAliasMethod; /* text draw options * UserDef.text_render */ @@ -817,6 +855,12 @@ typedef enum eGP_UserdefSettings { GP_PAINT_DOSIMPLIFY = (1 << 1), } eGP_UserdefSettings; +enum { + USER_MANIPULATOR_DRAW = (1 << 0), + USER_MANIPULATOR_DRAW_NAVIGATE = (1 << 1), + USER_MANIPULATOR_SHADED = (1 << 8), +}; + /* Color Picker Types. * UserDef.color_picker_type */ typedef enum eColorPicker_Types { |