qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-04-05 17:01:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ui] Rename Text_View to Text_PassageView

Browse source 
It works with passages but I want to be able to create simple text views
from strings, so Text_View was kind of polluting the namespace.
This commit is contained in:
Bill Currie 2023-07-01 14:40:20 +09:00
parent 09f257cdcb
commit 31151ec5d5
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/QF/ui/text.h
View file

@ -79,7 +79,7 @@ enum {
text_glyphs,
// text_script, text_font and text_features on the passage root object set
// the defaults for all text objects in the passage. The settings can be
// overridden at the paragraph level or individiual text object level by
// overridden at the paragraph level or individual text object level by
// adding the appropriate component to that text object.
// script settings for the text object
text_script,
@ -105,8 +105,8 @@ extern hb_feature_t CligOn;
struct font_s;
struct passage_s;
struct view_s Text_View (ecs_system_t viewsys,
struct font_s *font, struct passage_s *passage);
struct view_s Text_PassageView (ecs_system_t viewsys,
struct font_s *font, struct passage_s *passage);
void Text_SetScript (ecs_system_t textsys, uint32_t textid,
const char *lang, hb_script_t script, text_dir_e dir);
void Text_SetFont (ecs_system_t textsys, uint32_t textid,

6
libs/ruamoko/rua_gui.c
View file

@ -292,13 +292,13 @@ bi (Passage_GetChild)
R_UINT (pr) = h->ent[h->childIndex[par] + index];
}
bi (Text_View)
bi (Text_PassageView)
{
gui_resources_t *res = _res;
rua_font_t *font = get_font (res, P_INT (pr, 0));
rua_passage_t *psg = get_passage (res, P_INT (pr, 1));
ecs_system_t viewsys = { .reg = res->reg, .base = res->view_base };
view_t view = Text_View (viewsys, font->font, psg->passage);
view_t view = Text_PassageView (viewsys, font->font, psg->passage);
R_INT (pr) = view.id;//FIXME
}
@ -458,7 +458,7 @@ static builtin_t builtins[] = {
bi(Passage_ChildCount, 2, p(ptr), p(uint)),
bi(Passage_GetChild, 3, p(ptr), p(uint), p(uint)),
bi(Text_View, 2, p(ptr), p(int)),
bi(Text_PassageView, 2, p(ptr), p(int)),
bi(Text_SetScript, 4, p(uint), p(string), p(int), p (int)),
bi(View_Delete, 1, p(uint)),

2
libs/ui/text.c
View file

@ -111,7 +111,7 @@ static view_resize_f text_flow_funcs[] = {
};
view_t
Text_View (ecs_system_t viewsys, font_t *font, passage_t *passage)
Text_PassageView (ecs_system_t viewsys, font_t *font, passage_t *passage)
{
ecs_registry_t *reg = passage->reg;
hierarchy_t *h = passage->hierarchy;