ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/4coder/4coder

This commit is contained in:
Allen Webster 2016-07-05 10:08:09 -04:00
parent ef4ea218f3 d49ed3a2d4
commit 5e0030825b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linux_4ed.cpp
View File

@ -1,3 +1,4 @@
/* /*
* Mr. 4th Dimention - Allen Webster * Mr. 4th Dimention - Allen Webster
* *
@ -1167,7 +1168,8 @@ Font_Load_Sig(system_draw_font_load){
for(; attempts < 3; ++attempts){ for(; attempts < 3; ++attempts){
#if LINUX_FONTS #if LINUX_FONTS
success = linux_font_load(&linuxvars.font_part, font_out, filename, pt_size, tab_width); success = linux_font_load(&linuxvars.font_part, font_out, filename, pt_size, tab_width,
linuxvars.settings.use_hinting);
#else #else
success = font_load( success = font_load(
&linuxvars.font_part, &linuxvars.font_part,

5
linux_font.cpp
View File

@ -53,8 +53,7 @@ linux_get_sys_font(char* name, i32 pt_size){
} }
internal b32 internal b32
linux_font_load(Partition *part, Render_Font *rf, char *name, i32 pt_size, i32 tab_width){ linux_font_load(Partition *part, Render_Font *rf, char *name, i32 pt_size, i32 tab_width, b32 use_hinting){
b32 result = 0; b32 result = 0;
Temp_Memory temp = begin_temp_memory(part); Temp_Memory temp = begin_temp_memory(part);
@ -70,7 +69,7 @@ linux_font_load(Partition *part, Render_Font *rf, char *name, i32 pt_size, i32 t
#endif #endif
if (filename != 0){ if (filename != 0){
result = font_load_freetype(part, rf, filename, pt_size, tab_width); result = font_load_freetype(part, rf, filename, pt_size, tab_width, use_hinting);
} }
end_temp_memory(temp); end_temp_memory(temp);