[Bf-blender-cvs] [b1cee361906] master: BLF: Default Size as Float
Harley Acheson
noreply at git.blender.org
Sat Feb 5 03:05:34 CET 2022
Commit: b1cee3619062124497c73a24c3d87853f544c5f1
Author: Harley Acheson
Date: Fri Feb 4 18:04:16 2022 -0800
Branches: master
https://developer.blender.org/rBb1cee3619062124497c73a24c3d87853f544c5f1
BLF: Default Size as Float
Allowing setting and storing of the default font size as float.
See D13230 for more details.
Differential Revision: https://developer.blender.org/D13230
Reviewed by Campbell Barton
===================================================================
M source/blender/blenfont/BLF_api.h
M source/blender/blenfont/intern/blf_default.c
===================================================================
diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h
index 169107b19cb..638c5b727a6 100644
--- a/source/blender/blenfont/BLF_api.h
+++ b/source/blender/blenfont/BLF_api.h
@@ -309,7 +309,7 @@ void BLF_thumb_preview(const char *filename,
/* blf_default.c */
void BLF_default_dpi(int dpi);
-void BLF_default_size(int size);
+void BLF_default_size(float size);
void BLF_default_set(int fontid);
/**
* Get default font ID so we can pass it to other functions.
diff --git a/source/blender/blenfont/intern/blf_default.c b/source/blender/blenfont/intern/blf_default.c
index 57eeaa6768d..d5a0d514b5f 100644
--- a/source/blender/blenfont/intern/blf_default.c
+++ b/source/blender/blenfont/intern/blf_default.c
@@ -37,15 +37,15 @@
/* Default size and dpi, for BLF_draw_default. */
static int global_font_default = -1;
static int global_font_dpi = 72;
-/* Keep in sync with `UI_style_get()->widgetlabel.points` */
-static int global_font_size = 11;
+/* Keep in sync with `UI_DEFAULT_TEXT_POINTS` */
+static float global_font_size = 11.0f;
void BLF_default_dpi(int dpi)
{
global_font_dpi = dpi;
}
-void BLF_default_size(int size)
+void BLF_default_size(float size)
{
global_font_size = size;
}
More information about the Bf-blender-cvs
mailing list