mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

gg: handle Android's own native dpi scaling factor (#8908)

Browse Source
This commit is contained in:
spaceface
2021-02-22 20:24:18 +01:00
committed by GitHub
parent 79edff5c6c
commit b4dc6c83cd
3 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
vlib/gg/gg.v
View File

@@ -148,12 +148,7 @@ fn gg_init_sokol_window(user_data voidptr) {
gfx.setup(&desc)
sgl_desc := C.sgl_desc_t{}
sgl.setup(&sgl_desc)
g.scale = sapp.dpi_scale()
// NB: on older X11, `Xft.dpi` from ~/.Xresources, that sokol uses,
// may not be set which leads to sapp.dpi_scale reporting incorrectly 0.0
if g.scale < 0.1 {
g.scale = 1.0
}
g.scale = dpi_scale()
// is_high_dpi := sapp.high_dpi()
// fb_w := sapp.width()
// fb_h := sapp.height()
@@ -166,7 +161,7 @@ fn gg_init_sokol_window(user_data voidptr) {
g.ft = new_ft(
font_path: g.config.font_path
custom_bold_font_path: g.config.custom_bold_font_path
scale: sapp.dpi_scale()
scale: dpi_scale()
) or { panic(err) }
// println('FT took ${time.ticks()-t} ms')
g.font_inited = true
@@ -761,15 +756,21 @@ pub fn screen_size() Size {
// window_size returns the `Size` of the active window
pub fn window_size() Size {
mut s := sapp.dpi_scale()
if s == 0 {
s = 1.
}
s := dpi_scale()
return Size{int(sapp.width() / s), int(sapp.height() / s)}
}
pub fn dpi_scale() f32 {
return sapp.dpi_scale()
mut s := sapp.dpi_scale()
$if android {
s *= android_dpi_scale()
}
// NB: on older X11, `Xft.dpi` from ~/.Xresources, that sokol uses,
// may not be set which leads to sapp.dpi_scale reporting incorrectly 0.0
if s < 0.1 {
s = 1.
}
return s
}
pub fn high_dpi() bool {