vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

freetype: minor fixes

pull/4874/head
Alexander Medvednikov 2020-05-13 00:50:46 +02:00
parent 7a5a4df4c6
commit 3e6f7d3eb6
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vlib/freetype/freetype.v
View File

@ -292,7 +292,7 @@ fn (ctx mut FreeType) private_draw_text(_x, _y int, utext ustring, cfg gx.TextCf
mut x := f32(_x) mut x := f32(_x)
mut y := f32(_y) mut y := f32(_y)
wx, wy := ctx.text_size(utext.s) wx, wy := ctx.text_size(utext.s)
yoffset := if ctx.scale > 1 { 5 /* highdpi */ } else { -1 /* lowdpi */ } yoffset := if ctx.scale > 1 { 5 } else { -1 } // 5 hidpi, -1 lowdpi
// println('scale=$ctx.scale size=$cfg.size') // println('scale=$ctx.scale size=$cfg.size')
if cfg.align == gx.ALIGN_RIGHT { if cfg.align == gx.ALIGN_RIGHT {
//width := utext.len * 7 //width := utext.len * 7
@ -374,7 +374,7 @@ fn (ctx mut FreeType) private_draw_text(_x, _y int, utext ustring, cfg gx.TextCf
// Stop drawing if the limit is reached // Stop drawing if the limit is reached
if cfg.max_width > 0 { if cfg.max_width > 0 {
if x >= cfg.max_width { if x >= cfg.max_width {
break //break
} }
} }
} }

5
vlib/v/checker/checker.v
View File

@ -234,8 +234,7 @@ pub fn (mut c Checker) struct_decl(decl ast.StructDecl) {
if !c.table.check(field_expr_type, field.typ) { if !c.table.check(field_expr_type, field.typ) {
field_expr_type_sym := c.table.get_type_symbol(field_expr_type) field_expr_type_sym := c.table.get_type_symbol(field_expr_type)
field_type_sym := c.table.get_type_symbol(field.typ) field_type_sym := c.table.get_type_symbol(field.typ)
c.error('default expression for field `${field.name}` ' + c.error('default expression for field `${field.name}` ' + 'has type `${field_expr_type_sym.name}`, but should be `${field_type_sym.name}`',
'has type `${field_expr_type_sym.name}`, but should be `${field_type_sym.name}`',
field.default_expr.position()) field.default_expr.position())
} }
} }
@ -256,7 +255,7 @@ pub fn (mut c Checker) struct_init(mut struct_init ast.StructInit) table.Type {
struct_init.typ = c.expected_type struct_init.typ = c.expected_type
} }
type_sym := c.table.get_type_symbol(struct_init.typ) type_sym := c.table.get_type_symbol(struct_init.typ)
if !type_sym.is_public && type_sym.mod != c.mod { if !type_sym.is_public && type_sym.kind != .placeholder && type_sym.mod != c.mod {
c.warn('type `$type_sym.name` is private', struct_init.pos) c.warn('type `$type_sym.name` is private', struct_init.pos)
} }
// println('check struct $typ_sym.name') // println('check struct $typ_sym.name')