From a758a799cf79056470dde92c32ea88f2807dfac2 Mon Sep 17 00:00:00 2001 From: James Cook Date: Wed, 11 Nov 2009 10:56:31 -0800 Subject: Add widgets/ui_ctrl.xml that can set default font size across all widgets. Individual widgets/*.xml files will need to have explicit font="foo" params removed to start using the defaults. Discussed with Richard. --- indra/llui/lluictrl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llui/lluictrl.cpp') diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp index 08fc8fb784..dd807a3f7e 100644 --- a/indra/llui/lluictrl.cpp +++ b/indra/llui/lluictrl.cpp @@ -38,7 +38,7 @@ #include "llpanel.h" #include "lluictrlfactory.h" -static LLDefaultChildRegistry::Register r("ui_ctrl"); +static LLWidgetNameRegistry::StaticRegistrar r(&typeid(LLUICtrl::Params), "ui_ctrl"); LLUICtrl::Params::Params() : tab_stop("tab_stop", true), -- cgit v1.2.3 From 391f423cd0633262233d474622b56dd3b151ab32 Mon Sep 17 00:00:00 2001 From: James Cook Date: Wed, 11 Nov 2009 16:34:23 -0800 Subject: Revert global font setting for UI controls because it makes About Land crash Apparently moving ui_ctrl to a different registry breaks our ability to create dummy ones in code. Reverting until I have time to investigate. Discussed with Richard --- indra/llui/lluictrl.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'indra/llui/lluictrl.cpp') diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp index dd807a3f7e..aaadc1b58d 100644 --- a/indra/llui/lluictrl.cpp +++ b/indra/llui/lluictrl.cpp @@ -38,7 +38,11 @@ #include "llpanel.h" #include "lluictrlfactory.h" -static LLWidgetNameRegistry::StaticRegistrar r(&typeid(LLUICtrl::Params), "ui_ctrl"); +// This breaks the ability to construct dummy LLUICtrls for calls like +// getChild("not-there") +//static LLWidgetNameRegistry::StaticRegistrar r(&typeid(LLUICtrl::Params), "ui_ctrl"); +// This doesn't appear to read/apply ui_ctrl.xml +static LLDefaultChildRegistry::Register r("ui_ctrl"); LLUICtrl::Params::Params() : tab_stop("tab_stop", true), -- cgit v1.2.3