blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

UI: mono-space font user preference

This commit is contained in:
Campbell Barton 2015-12-01 16:57:52 +11:00
parent 0b1b774674
commit 6783c673e6
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
release/scripts/startup/bl_ui/space_userpref.py
View File

@ -527,6 +527,7 @@ class USERPREF_PT_system(Panel):
column.separator()
column.prop(system, "font_path_ui")
column.prop(system, "font_path_ui_mono")
if bpy.app.build_options.international:
column.prop(system, "use_international_fonts")

14
source/blender/editors/interface/interface_style.c
View File

@ -410,6 +410,11 @@ void uiStyleInit(void)
BLF_unload_id(font->blf_id);
}
if (blf_mono_font != -1) {
BLF_unload_id(blf_mono_font);
blf_mono_font = -1;
}
font = U.uifonts.first;
/* default builtin */
@ -498,14 +503,17 @@ void uiStyleInit(void)
}
/* reload */
BLF_unload("monospace");
blf_mono_font = -1;
blf_mono_font_render = -1;
#endif
/* XXX, this should be moved into a style, but for now best only load the monospaced font once. */
if (blf_mono_font == -1)
BLI_assert(blf_mono_font == -1);
if (U.font_path_ui_mono[0]) {
blf_mono_font = BLF_load_unique(U.font_path_ui_mono);
}
if (blf_mono_font == -1) {
blf_mono_font = BLF_load_mem_unique("monospace", monofont_ttf, monofont_size);
}
BLF_size(blf_mono_font, 12 * U.pixelsize, 72);

1
source/blender/makesdna/DNA_userdef_types.h
View File

@ -545,6 +545,7 @@ typedef struct UserDef {
char author[80]; /* author name for file formats supporting it */
char font_path_ui[1024];
char font_path_ui_mono[1024];
int compute_device_type;
int compute_device_id;

5
source/blender/makesrna/intern/rna_userdef.c
View File

@ -4000,6 +4000,11 @@ static void rna_def_userdef_system(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Interface Font", "Path to interface font");
RNA_def_property_update(prop, NC_WINDOW, "rna_userdef_language_update");
prop = RNA_def_property(srna, "font_path_ui_mono", PROP_STRING, PROP_FILEPATH);
RNA_def_property_string_sdna(prop, NULL, "font_path_ui_mono");
RNA_def_property_ui_text(prop, "Monospace Font", "Path to interface monospace Font");
RNA_def_property_update(prop, NC_WINDOW, "rna_userdef_language_update");
prop = RNA_def_property(srna, "scrollback", PROP_INT, PROP_UNSIGNED);
RNA_def_property_int_sdna(prop, NULL, "scrollback");
RNA_def_property_range(prop, 32, 32768);