diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index fe360f88135936580030a91770a4a531b7ef5134..8a9ce3f1565984196d9ae65d8a89cfbe83ed154f 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -448,7 +448,7 @@ F32 LLFontGL::getDescenderHeight() const
S32 LLFontGL::getLineHeight() const
{
- return llceil(mFontFreetype->getAscenderHeight() / sScaleY) + llceil(mFontFreetype->getDescenderHeight() / sScaleY);
+ return llfloor((mFontFreetype->getAscenderHeight() + mFontFreetype->getDescenderHeight()) / sScaleY);
}
S32 LLFontGL::getWidth(const std::string& utf8text) const
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 7a2ac3228c95181c8ea2b12da10348726f963a62..713bea00cbc5e98536e81f203734de5ee8c8cd0f 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -1633,9 +1633,9 @@ void LLMenuItemBranchDownGL::draw( void )
{
color = mDisabledColor.get();
}
- getFont()->render( mLabel.getWString(), 0, (F32)getRect().getWidth() / 2.f, (F32)LABEL_BOTTOM_PAD_PIXELS, color,
- LLFontGL::HCENTER, LLFontGL::BOTTOM, LLFontGL::NORMAL);
-
+ getFont()->render(mLabel.getWString(), 0,
+ (F32)getRect().getWidth() / 2.f, (getRect().getHeight() - getFont()->getLineHeight()) / 2, color,
+ LLFontGL::HCENTER, LLFontGL::BOTTOM, LLFontGL::NORMAL);
// underline navigation key only when keyboard navigation has been initiated
if (getMenu()->jumpKeysActive() && LLMenuGL::getKeyboardMode())
diff --git a/indra/newview/app_settings/settings_alchemy.xml b/indra/newview/app_settings/settings_alchemy.xml
index 3a131667461300e7741a7f38ee18db08dbfdae7c..6147de76ed3bf94ca4d4f2204bb733b676a7721a 100644
--- a/indra/newview/app_settings/settings_alchemy.xml
+++ b/indra/newview/app_settings/settings_alchemy.xml
@@ -1800,6 +1800,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>ChatFontName</key>
+ <map>
+ <key>Comment</key>
+ <string>Name of font for Chat Editors and Messages</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
+ <string>SansSerif</string>
+ </map>
<key>NotecardFontName</key>
<map>
<key>Comment</key>
diff --git a/indra/newview/llviewerchat.cpp b/indra/newview/llviewerchat.cpp
index 8ef50fc477198cd4132b4a4fef79a852f4a03a10..374ced72b67e7516bfe8a05a2cffc9ce22edb384 100644
--- a/indra/newview/llviewerchat.cpp
+++ b/indra/newview/llviewerchat.cpp
@@ -186,9 +186,11 @@ void LLViewerChat::getChatColor(const LLChat& chat, std::string& r_color_name, F
LLFontGL* LLViewerChat::getChatFont()
{
S32 font_size = gSavedSettings.getS32("ChatFontSize");
- LLFontGL* fontp = NULL;
- switch(font_size)
+ LLFontGL* fontp = LLFontGL::getFont(LLFontDescriptor(gSavedSettings.getString("ChatFontName"), getChatFontSizeStr(font_size), 0).normalize());
+ if (!fontp)
{
+ switch (font_size)
+ {
case -1:
fontp = LLFontGL::getFontMonospace();
break;
@@ -205,10 +207,9 @@ LLFontGL* LLViewerChat::getChatFont()
case 3:
fontp = LLFontGL::getFontSansSerifHuge();
break;
+ }
}
-
return fontp;
-
}
//static
@@ -217,6 +218,31 @@ S32 LLViewerChat::getChatFontSize()
return gSavedSettings.getS32("ChatFontSize");
}
+//static
+std::string LLViewerChat::getChatFontSizeStr(S32 size)
+{
+ std::string ret;
+ switch (size)
+ {
+ case -1:
+ ret = "Monospace";
+ break;
+ case 0:
+ ret = "Small";
+ break;
+ default:
+ case 1:
+ ret = "Medium";
+ break;
+ case 2:
+ ret = "Large";
+ break;
+ case 3:
+ ret = "Huge";
+ break;
+ }
+ return ret;
+}
//static
void LLViewerChat::formatChatMsg(const LLChat& chat, std::string& formated_msg)
diff --git a/indra/newview/llviewerchat.h b/indra/newview/llviewerchat.h
index c05caf0a951fd62ce676e37cc0179576971709b2..f6e6afba5757694722c17f9b7bbcb42eed72a2e2 100644
--- a/indra/newview/llviewerchat.h
+++ b/indra/newview/llviewerchat.h
@@ -43,6 +43,7 @@ class LLViewerChat
static S32 getChatFontSize();
static void formatChatMsg(const LLChat& chat, std::string& formated_msg);
static std::string getSenderSLURL(const LLChat& chat, const LLSD& args);
+ static std::string getChatFontSizeStr(S32 size);
static boost::signals2::connection setFontChangedCallback(const font_change_signal_t::slot_type& cb);
static void signalChatFontChanged();
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 23fa6e4014bff1abbcdc77e51b035380255fa3a9..992d1ad23d3932cda3ca14eab15136a92e3e2a8f 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -777,6 +777,7 @@ void settings_setup_listeners()
setting_setup_signal_listener(gSavedSettings, "RenderShadowDetail", handleSetShaderChanged);
setting_setup_signal_listener(gSavedSettings, "RenderDeferredSSAO", handleSetShaderChanged);
setting_setup_signal_listener(gSavedSettings, "RenderPerformanceTest", handleRenderPerfTestChanged);
+ setting_setup_signal_listener(gSavedSettings, "ChatFontName", handleChatFontSizeChanged);
setting_setup_signal_listener(gSavedSettings, "ChatFontSize", handleChatFontSizeChanged);
setting_setup_signal_listener(gSavedSettings, "ChatPersistTime", handleChatPersistTimeChanged);
setting_setup_signal_listener(gSavedSettings, "ConsoleMaxLines", handleConsoleMaxLinesChanged);
diff --git a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
index 7eae99d0a26eb759eb3d9f59734dc3992dcdda2a..23d1236dc88b7c60a66e546428ae7953fda697c3 100644
--- a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
@@ -409,6 +409,10 @@ default
label="Fira Code"
name="FiraCode"
value="FiraCode" />
+ <combo_box.item.item
+ label="IBM Plex Mono"
+ name="IBMPlexMono"
+ value="IBMPlexMono"/>
<combo_box.item
label="Jetbrains Mono"
name="JetbrainsMono"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 853833d8dedaa44321fd0dc8d059a42c8d459f85..12eae2fe766f29ee004dd0b69f84080cded6d2d1 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -13,7 +13,7 @@
single_instance="true"
save_visibility="true"
sound_flags="0"
- width="295">
+ width="308">
<floater.string
name="grid_screen_text">
Screen
@@ -887,7 +887,7 @@
tab_height="20"
open_tabs_on_drag_and_drop="true"
top="203"
- width="295">
+ width="308">
<panel
border="false"
@@ -1553,17 +1553,17 @@ even though the user gets a free copy.
top_pad="3"
width="87" />
<button
- follows="top|right"
+ follows="top|left"
height="19"
top_delta="-43"
- left_pad="5"
+ left_pad="0"
tab_stop="false"
image_overlay="Clipboard_Copy"
name="copy_position_btn"
tool_tip="Copy Position"
width="20" />
<button
- follows="top|right"
+ follows="top|left"
height="19"
top_pad="3"
tab_stop="false"
@@ -1572,7 +1572,7 @@ even though the user gets a free copy.
tool_tip="Paste Position"
width="20" />
<button
- follows="top|right"
+ follows="top|left"
height="19"
top_pad="3"
mouse_opaque="true"
@@ -1644,7 +1644,7 @@ even though the user gets a free copy.
top_pad="3"
width="87" />
<button
- follows="top|right"
+ follows="top|left"
height="19"
top_delta="-43"
left_pad="5"
@@ -1654,7 +1654,7 @@ even though the user gets a free copy.
tool_tip="Copy Size"
width="20" />
<button
- follows="top|right"
+ follows="top|left"
height="19"
top_pad="3"
tab_stop="false"
@@ -1663,7 +1663,7 @@ even though the user gets a free copy.
tool_tip="Paste Size"
width="20" />
<button
- follows="top|right"
+ follows="top|left"
height="19"
top_pad="3"
mouse_opaque="true"
@@ -1735,7 +1735,7 @@ even though the user gets a free copy.
top_pad="3"
width="87" />
<button
- follows="top|right"
+ follows="top|left"
height="19"
top_delta="-43"
left_pad="5"
@@ -1745,7 +1745,7 @@ even though the user gets a free copy.
tool_tip="Copy Rotation"
width="20" />
<button
- follows="top|right"
+ follows="top|left"
height="19"
top_pad="3"
tab_stop="false"
@@ -1754,7 +1754,7 @@ even though the user gets a free copy.
tool_tip="Paste Rotation"
width="20" />
<button
- follows="top|right"
+ follows="top|left"
height="19"
top_pad="3"
mouse_opaque="true"
@@ -1788,6 +1788,7 @@ even though the user gets a free copy.
width="0"/>
<combo_box
height="19"
+ follows="top|left"
layout="topleft"
name="comboBaseType"
top="6"
@@ -2016,6 +2017,7 @@ even though the user gets a free copy.
<combo_box
height="23"
layout="topleft"
+ follows="top|left"
left_delta="0"
name="hole"
top_pad="-2"
@@ -2421,7 +2423,7 @@ even though the user gets a free copy.
<button
follows="top|left"
height="19"
- left="225"
+ left="235"
top="8"
tab_stop="false"
image_overlay="Clipboard_Copy"
@@ -2462,7 +2464,7 @@ even though the user gets a free copy.
top="5"
width="252"
word_wrap="true">
- Select only one primitive to edit features.
+ Select only one prim to edit features.
</text>
<text
type="string"
@@ -2649,8 +2651,9 @@ even though the user gets a free copy.
width="32" />
<button
follows="top|left"
+ layout="topleft"
height="19"
- left="225"
+ left="235"
top_delta="0"
tab_stop="false"
image_overlay="Clipboard_Copy"
@@ -2844,6 +2847,7 @@ even though the user gets a free copy.
<combo_box
height="19"
layout="topleft"
+ follows="top|left"
name="material"
top_pad="5"
width="150">
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index b727ef7028ea351185a858908d715bb72b8a8128..ab9485933da6400f301f9ead9c93f0c0f420b386 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -1,207 +1,230 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<fonts>
- <font name="default" comment="default font files (global fallbacks)">
- <file>DejaVuSans.ttf</file>
- <file>NotoSans-Regular.ttf</file>
- <file load_collection="true">NotoSansCJK-Regular.ttc</file>
- <file>NotoSansTamil-Regular.ttf</file>
- <file>NotoSansOriya-Regular.ttf</file>
- <file>NotoSansKannada-Regular.ttf</file>
- <file>NotoSansDevanagari-Regular.ttf</file>
- <file>NotoNaskhArabicUI-Regular.ttf</file>
- <file>NotoLoopedThaiUI-Regular.ttf</file>
- <file>NotoSansSymbols-Regular.ttf</file>
- <file>NotoSansSymbols2-Regular.ttf</file>
- <file>NotoSansMath-Regular.ttf</file>
- <os name="Windows">
- <file>meiryo.TTC</file>
- <file>MSGOTHIC.TTC</file>
- <file>gulim.ttc</file>
- <file>simhei.ttf</file>
- <file>ArialUni.ttf</file>
- <file>msyh.ttc</file>
- <file load_collection="true">Cambria.ttc</file>
- <file>malgun.ttf</file>
- <file>micross.ttf</file>
- <file>seguiemj.ttf</file>
- </os>
- <os name="Mac">
- <file>ヒラギノ角ゴシック W3.ttc</file>
- <file>ヒラã‚゙ノ角ゴ Pro W3.otf</file>
- <file>ヒラã‚゙ノ角ゴ ProN W3.otf</file>
- <file>ヒラã‚ã‚™ãƒŽæ˜Žæœ ProN W3.ttc</file>
- <file>AppleGothic.dfont</file>
- <file>AppleGothic.ttf</file>
- <file>AppleSDGothicNeo-Regular.otf</file>
- <file>AppleSDGothicNeo.ttc</file>
- <file>åŽæ–‡ç»†é»‘.ttf</file>
- <file>PingFang.ttc</file>
- <file>STIXGeneral.otf</file>
- <file>Thonburi.ttc</file>
- </os>
- </font>
-
- <font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
- <file>DejaVuSans.ttf</file>
- <os name="Windows">
- <file>arial.ttf</file>
- </os>
- <os name="Mac">
- <file>Helvetica.dfont</file>
- </os>
- </font>
-
- <font name="SansSerif"
- comment="Name of bold sans-serif font"
- font_style="BOLD">
- <file>DejaVuSans-Bold.ttf</file>
- <file>NotoSans-Bold.ttf</file>
- <file load_collection="true">NotoSansCJK-Bold.ttc</file>
- <file>NotoSansTamil-Bold.ttf</file>
- <file>NotoSansOriya-Bold.ttf</file>
- <file>NotoSansKannada-Bold.ttf</file>
- <file>NotoSansDevanagari-Bold.ttf</file>
- <file>NotoNaskhArabicUI-Bold.ttf</file>
- <file>NotoLoopedThaiUI-Bold.ttf</file>
- <file>NotoSansSymbols-Bold.ttf</file>
- <os name="Windows">
- <file>arialbd.ttf</file>
- </os>
- <os name="Mac">
- <file>Helvetica.dfont</file>
- </os>
- </font>
-
- <font name="SansSerif"
- comment="Name of italic sans-serif font"
- font_style="ITALIC">
- <file>DejaVuSans-Oblique.ttf</file>
- <file>NotoSans-Italic.ttf</file>
- </font>
-
- <font name="SansSerif"
- comment="Name of bold italic sans-serif font"
- font_style="BOLD|ITALIC">
- <file>DejaVuSans-BoldOblique.ttf</file>
- <file>NotoSans-BoldItalic.ttf</file>
- </font>
-
- <font name="Monospace"
- comment="Name of monospace font">
- <file>DejaVuSansMono.ttf</file>
- <file>NotoSansMono-Regular.ttf</file>
- </font>
-
- <font name="Monospace" font_style="BOLD">
- <file>DejaVuSansMono-Bold.ttf</file>
- </font>
-
- <font name="Monospace" font_style="ITALIC">
- <file>DejaVuSansMono-Oblique.ttf</file>
- </font>
-
- <font name="Monospace" font_style="BOLD|ITALIC">
- <file>DejaVuSansMono-BoldOblique.ttf</file>
- </font>
-
- <font name="DejaVu"
- comment="Name of DejaVu font">
- <file>DejaVuSans.ttf</file>
- </font>
-
- <font name="DejaVu"
- comment="Name of DejaVu font (bold)"
- font_style="BOLD">
- <file>DejaVuSans-Bold.ttf</file>
- </font>
-
- <font name="DejaVu"
- comment="Name of DejaVu font (italic)"
- font_style="ITALIC">
- <file>DejaVuSans-Oblique.ttf</file>
- </font>
-
- <font name="DejaVu"
- comment="Name of DejaVu font (bold italic)"
- font_style="BOLD|ITALIC">
- <file>DejaVuSans-BoldOblique.ttf</file>
- </font>
-
- <font name="Helvetica"
- comment="Name of Helvetica font">
- <file>DejaVuSans.ttf</file>
- <os name="Windows">
- <file>arial.ttf</file>
- </os>
- <os name="Mac">
- <file>arial.ttf</file>
- </os>
- </font>
-
- <font name="Helvetica"
- comment="Name of Helvetica font (bold)"
- font_style="BOLD">
- <file>DejaVuSans-Bold.ttf</file>
- <os name="Windows">
- <file>arialbd.ttf</file>
- </os>
- <os name="Mac">
- <file>arialbd.ttf</file>
- </os>
- </font>
-
- <font name="Helvetica"
- comment="Name of Helvetica font (italic)"
- font_style="ITALIC">
- <file>DejaVuSans-Oblique.ttf</file>
- <os name="Windows">
- <file>ariali.ttf</file>
- </os>
- <os name="Mac">
- <file>ariali.ttf</file>
- </os>
- </font>
-
- <font name="Helvetica"
- comment="Name of Helvetica font (bold italic)"
- font_style="BOLD|ITALIC">
- <file>DejaVuSans-BoldOblique.ttf</file>
- <os name="Windows">
- <file>arialbi.ttf</file>
- </os>
- <os name="Mac">
- <file>arialbi.ttf</file>
- </os>
- </font>
-
- <font name="OverrideTest"
- comment="Name of font to test overriding">
- <file>times.ttf</file>
- <file>DejaVuSans.ttf</file>
- </font>
-
- <font_size name="Monospace"
- comment="Size for monospaced font (points, or 1/72 of an inch)"
- size="8.0"
+ <font name="default" comment="default font files (global fallbacks)">
+ <file>DejaVuSans.ttf</file>
+ <file>NotoSans-Regular.ttf</file>
+ <file load_collection="true">NotoSansCJK-Regular.ttc</file>
+ <file>NotoSansTamil-Regular.ttf</file>
+ <file>NotoSansOriya-Regular.ttf</file>
+ <file>NotoSansKannada-Regular.ttf</file>
+ <file>NotoSansDevanagari-Regular.ttf</file>
+ <file>NotoNaskhArabicUI-Regular.ttf</file>
+ <file>NotoLoopedThaiUI-Regular.ttf</file>
+ <file>NotoSansSymbols-Regular.ttf</file>
+ <file>NotoSansSymbols2-Regular.ttf</file>
+ <file>NotoSansMath-Regular.ttf</file>
+ <os name="Windows">
+ <file>meiryo.TTC</file>
+ <file>MSGOTHIC.TTC</file>
+ <file>gulim.ttc</file>
+ <file>simhei.ttf</file>
+ <file>ArialUni.ttf</file>
+ <file>msyh.ttc</file>
+ <file load_collection="true">Cambria.ttc</file>
+ <file>malgun.ttf</file>
+ <file>micross.ttf</file>
+ <file>seguiemj.ttf</file>
+ </os>
+ <os name="Mac">
+ <file>ヒラギノ角ゴシック W3.ttc</file>
+ <file>ヒラã‚゙ノ角ゴ Pro W3.otf</file>
+ <file>ヒラã‚゙ノ角ゴ ProN W3.otf</file>
+ <file>ヒラã‚ã‚™ãƒŽæ˜Žæœ ProN W3.ttc</file>
+ <file>AppleGothic.dfont</file>
+ <file>AppleGothic.ttf</file>
+ <file>AppleSDGothicNeo-Regular.otf</file>
+ <file>AppleSDGothicNeo.ttc</file>
+ <file>åŽæ–‡ç»†é»‘.ttf</file>
+ <file>PingFang.ttc</file>
+ <file>STIXGeneral.otf</file>
+ <file>Thonburi.ttc</file>
+ </os>
+ </font>
+
+ <font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
+ <file>DejaVuSans.ttf</file>
+ <os name="Windows">
+ <file>arial.ttf</file>
+ </os>
+ <os name="Mac">
+ <file>Helvetica.dfont</file>
+ </os>
+ </font>
+
+ <font name="SansSerif"
+ comment="Name of bold sans-serif font"
+ font_style="BOLD">
+ <file>DejaVuSans-Bold.ttf</file>
+ <file>NotoSans-Bold.ttf</file>
+ <file load_collection="true">NotoSansCJK-Bold.ttc</file>
+ <file>NotoSansTamil-Bold.ttf</file>
+ <file>NotoSansOriya-Bold.ttf</file>
+ <file>NotoSansKannada-Bold.ttf</file>
+ <file>NotoSansDevanagari-Bold.ttf</file>
+ <file>NotoNaskhArabicUI-Bold.ttf</file>
+ <file>NotoLoopedThaiUI-Bold.ttf</file>
+ <file>NotoSansSymbols-Bold.ttf</file>
+ <os name="Windows">
+ <file>arialbd.ttf</file>
+ </os>
+ <os name="Mac">
+ <file>Helvetica.dfont</file>
+ </os>
+ </font>
+
+ <font name="SansSerif"
+ comment="Name of italic sans-serif font"
+ font_style="ITALIC">
+ <file>DejaVuSans-Oblique.ttf</file>
+ <file>NotoSans-Italic.ttf</file>
+ </font>
+
+ <font name="SansSerif"
+ comment="Name of bold italic sans-serif font"
+ font_style="BOLD|ITALIC">
+ <file>DejaVuSans-BoldOblique.ttf</file>
+ <file>NotoSans-BoldItalic.ttf</file>
+ </font>
+
+ <font name="Monospace"
+ comment="Name of monospace font">
+ <file>DejaVuSansMono.ttf</file>
+ <file>NotoSansMono-Regular.ttf</file>
+ </font>
+
+ <font name="Monospace" font_style="BOLD">
+ <file>DejaVuSansMono-Bold.ttf</file>
+ </font>
+
+ <font name="Monospace" font_style="ITALIC">
+ <file>DejaVuSansMono-Oblique.ttf</file>
+ </font>
+
+ <font name="Monospace" font_style="BOLD|ITALIC">
+ <file>DejaVuSansMono-BoldOblique.ttf</file>
+ </font>
+
+ <font name="DejaVu"
+ comment="Name of DejaVu font">
+ <file>DejaVuSans.ttf</file>
+ </font>
+
+ <font name="DejaVu"
+ comment="Name of DejaVu font (bold)"
+ font_style="BOLD">
+ <file>DejaVuSans-Bold.ttf</file>
+ </font>
+
+ <font name="DejaVu"
+ comment="Name of DejaVu font (italic)"
+ font_style="ITALIC">
+ <file>DejaVuSans-Oblique.ttf</file>
+ </font>
+
+ <font name="DejaVu"
+ comment="Name of DejaVu font (bold italic)"
+ font_style="BOLD|ITALIC">
+ <file>DejaVuSans-BoldOblique.ttf</file>
+ </font>
+
+ <font name="Helvetica"
+ comment="Name of Helvetica font">
+ <file>DejaVuSans.ttf</file>
+ <os name="Windows">
+ <file>arial.ttf</file>
+ </os>
+ <os name="Mac">
+ <file>arial.ttf</file>
+ </os>
+ </font>
+
+ <font name="Helvetica"
+ comment="Name of Helvetica font (bold)"
+ font_style="BOLD">
+ <file>DejaVuSans-Bold.ttf</file>
+ <os name="Windows">
+ <file>arialbd.ttf</file>
+ </os>
+ <os name="Mac">
+ <file>arialbd.ttf</file>
+ </os>
+ </font>
+
+ <font name="Helvetica"
+ comment="Name of Helvetica font (italic)"
+ font_style="ITALIC">
+ <file>DejaVuSans-Oblique.ttf</file>
+ <os name="Windows">
+ <file>ariali.ttf</file>
+ </os>
+ <os name="Mac">
+ <file>ariali.ttf</file>
+ </os>
+ </font>
+
+ <font name="Helvetica"
+ comment="Name of Helvetica font (bold italic)"
+ font_style="BOLD|ITALIC">
+ <file>DejaVuSans-BoldOblique.ttf</file>
+ <os name="Windows">
+ <file>arialbi.ttf</file>
+ </os>
+ <os name="Mac">
+ <file>arialbi.ttf</file>
+ </os>
+ </font>
+
+ <font name="OverrideTest"
+ comment="Name of font to test overriding">
+ <file>times.ttf</file>
+ <file>DejaVuSans.ttf</file>
+ </font>
+
+ <font_size name="Monospace"
+ comment="Size for monospaced font (points, or 1/72 of an inch)"
+ size="8.0"
/>
- <font_size name="Huge"
- comment="Size of huge font (points, or 1/72 of an inch)"
- size="16.0"
+ <font_size name="Huge"
+ comment="Size of huge font (points, or 1/72 of an inch)"
+ size="16.0"
/>
- <font_size name="Large"
- comment="Size of large font (points, or 1/72 of an inch)"
- size="10.6"
+ <font_size name="Large"
+ comment="Size of large font (points, or 1/72 of an inch)"
+ size="11.4"
/>
- <font_size name="Medium"
- comment="Size of medium font (points, or 1/72 of an inch)"
- size="8.6"
+ <font_size name="Medium"
+ comment="Size of medium font (points, or 1/72 of an inch)"
+ size="9.4"
/>
- <font_size name="Small"
- comment="Size of small font (points, or 1/72 of an inch)"
- size="7.6"
+ <font_size name="Small"
+ comment="Size of small font (points, or 1/72 of an inch)"
+ size="8.4"
/>
+ <!--IBM Plex-->
+ <font name="IBMPlex">
+ <file>IBMPlexSans-Regular.ttf</file>
+ </font>
+
+ <font name="IBMPlex" font_style="BOLD">
+ <file>IBMPlexSans-Bold.ttf</file>
+ </font>
+
+ <font name="IBMPlex" font_style="ITALIC">
+ <file>IBMPlexSans-Italic.ttf</file>
+ </font>
+
+ <font name="IBMPlex" font_style="BOLD|ITALIC">
+ <file>IBMPlexSans-BoldItalic.ttf</file>
+ </font>
+
+ <font_size name="Monospace" font="IBMPlex" size="8.0" />
+ <font_size name="Huge" font="IBMPlex" size="16.0" />
+ <font_size name="Large" font="IBMPlex" size="11.4" />
+ <font_size name="Medium" font="IBMPlex" size="9.4" />
+ <font_size name="Small" font="IBMPlex" size="8.4" />
+
<!--NotoSans-->
<font name="NotoSans">
<file>NotoSans-Regular.ttf</file>
@@ -221,32 +244,9 @@
<font_size name="Monospace" font="NotoSans" size="8.0" />
<font_size name="Huge" font="NotoSans" size="16.0" />
- <font_size name="Large" font="NotoSans" size="11.6" />
- <font_size name="Medium" font="NotoSans" size="9.6" />
- <font_size name="Small" font="NotoSans" size="8.6" />
-
- <!--NotoSerif-->
- <font name="NotoSerif">
- <file>NotoSerif-Regular.ttf</file>
- </font>
-
- <font name="NotoSerif" font_style="BOLD">
- <file>NotoSerif-Bold.ttf</file>
- </font>
-
- <font name="NotoSerif" font_style="ITALIC">
- <file>NotoSerif-Italic.ttf</file>
- </font>
-
- <font name="NotoSerif" font_style="BOLD|ITALIC">
- <file>NotoSerif-BoldItalic.ttf</file>
- </font>
-
- <font_size name="Monospace" font="NotoSerif" size="8.0" />
- <font_size name="Huge" font="NotoSerif" size="16.0" />
- <font_size name="Large" font="NotoSerif" size="11.6" />
- <font_size name="Medium" font="NotoSerif" size="9.6" />
- <font_size name="Small" font="NotoSerif" size="8.6" />
+ <font_size name="Large" font="NotoSans" size="11.4" />
+ <font_size name="Medium" font="NotoSans" size="9.4" />
+ <font_size name="Small" font="NotoSans" size="8.4" />
<!--OpenDyslexic-->
<font name="OpenDyslexic">
@@ -267,9 +267,9 @@
<font_size name="Monospace" font="OpenDyslexic" size="8.0" />
<font_size name="Huge" font="OpenDyslexic" size="16.0" />
- <font_size name="Large" font="OpenDyslexic" size="11.6" />
- <font_size name="Medium" font="OpenDyslexic" size="9.6" />
- <font_size name="Small" font="OpenDyslexic" size="8.6" />
+ <font_size name="Large" font="OpenDyslexic" size="11.4" />
+ <font_size name="Medium" font="OpenDyslexic" size="9.4" />
+ <font_size name="Small" font="OpenDyslexic" size="8.4" />
<!--Source Sans 3-->
<font name="SourceSans">
@@ -290,9 +290,9 @@
<font_size name="Monospace" font="SourceSans" size="8.0" />
<font_size name="Huge" font="SourceSans" size="16.0" />
- <font_size name="Large" font="SourceSans" size="11.6" />
- <font_size name="Medium" font="SourceSans" size="9.6" />
- <font_size name="Small" font="SourceSans" size="8.6" />
+ <font_size name="Large" font="SourceSans" size="11.4" />
+ <font_size name="Medium" font="SourceSans" size="9.4" />
+ <font_size name="Small" font="SourceSans" size="8.4" />
<!--Ubuntu-->
<font name="Ubuntu">
@@ -313,9 +313,9 @@
<font_size name="Monospace" font="Ubuntu" size="8.0" />
<font_size name="Huge" font="Ubuntu" size="16.0" />
- <font_size name="Large" font="Ubuntu" size="11.6" />
- <font_size name="Medium" font="Ubuntu" size="9.6" />
- <font_size name="Small" font="Ubuntu" size="8.6" />
+ <font_size name="Large" font="Ubuntu" size="11.4" />
+ <font_size name="Medium" font="Ubuntu" size="9.4" />
+ <font_size name="Small" font="Ubuntu" size="8.4" />
<!--Monospace Fonts-->
@@ -338,9 +338,9 @@
<font_size name="Monospace" font="CascadiaCode" size="8.0" />
<font_size name="Huge" font="CascadiaCode" size="16.0" />
- <font_size name="Large" font="CascadiaCode" size="11.6" />
- <font_size name="Medium" font="CascadiaCode" size="9.6" />
- <font_size name="Small" font="CascadiaCode" size="8.6" />
+ <font_size name="Large" font="CascadiaCode" size="11.4" />
+ <font_size name="Medium" font="CascadiaCode" size="9.4" />
+ <font_size name="Small" font="CascadiaCode" size="8.4" />
<!--Fira Code-->
<font name="FiraCode">
@@ -353,9 +353,32 @@
<font_size name="Monospace" font="FiraCode" size="8.0" />
<font_size name="Huge" font="FiraCode" size="16.0" />
- <font_size name="Large" font="FiraCode" size="11.6" />
- <font_size name="Medium" font="FiraCode" size="9.6" />
- <font_size name="Small" font="FiraCode" size="8.6" />
+ <font_size name="Large" font="FiraCode" size="11.4" />
+ <font_size name="Medium" font="FiraCode" size="9.4" />
+ <font_size name="Small" font="FiraCode" size="8.4" />
+
+ <!--IBM Plex-->
+ <font name="IBMPlexMono">
+ <file>IBMPlexMono-Regular.ttf</file>
+ </font>
+
+ <font name="IBMPlexMono" font_style="BOLD">
+ <file>IBMPlexMono-Bold.ttf</file>
+ </font>
+
+ <font name="IBMPlexMono" font_style="ITALIC">
+ <file>IBMPlexMono-Italic.ttf</file>
+ </font>
+
+ <font name="IBMPlexMono" font_style="BOLD|ITALIC">
+ <file>IBMPlexMono-BoldItalic.ttf</file>
+ </font>
+
+ <font_size name="Monospace" font="IBMPlexMono" size="8.0" />
+ <font_size name="Huge" font="IBMPlexMono" size="16.0" />
+ <font_size name="Large" font="IBMPlexMono" size="11.4" />
+ <font_size name="Medium" font="IBMPlexMono" size="9.4" />
+ <font_size name="Small" font="IBMPlexMono" size="8.4" />
<!--Jetbrains Mono-->
<font name="JetbrainsMono">
@@ -376,9 +399,9 @@
<font_size name="Monospace" font="JetbrainsMono" size="8.0" />
<font_size name="Huge" font="JetbrainsMono" size="16.0" />
- <font_size name="Large" font="JetbrainsMono" size="11.6" />
- <font_size name="Medium" font="JetbrainsMono" size="9.6" />
- <font_size name="Small" font="JetbrainsMono" size="8.6" />
+ <font_size name="Large" font="JetbrainsMono" size="11.4" />
+ <font_size name="Medium" font="JetbrainsMono" size="9.4" />
+ <font_size name="Small" font="JetbrainsMono" size="8.4" />
<!--Monaspace Argon-->
<font name="MonaspaceArgon">
@@ -399,9 +422,9 @@
<font_size name="Monospace" font="MonaspaceArgon" size="8.0" />
<font_size name="Huge" font="MonaspaceArgon" size="16.0" />
- <font_size name="Large" font="MonaspaceArgon" size="11.6" />
- <font_size name="Medium" font="MonaspaceArgon" size="9.6" />
- <font_size name="Small" font="MonaspaceArgon" size="8.6" />
+ <font_size name="Large" font="MonaspaceArgon" size="11.4" />
+ <font_size name="Medium" font="MonaspaceArgon" size="9.4" />
+ <font_size name="Small" font="MonaspaceArgon" size="8.4" />
<!--Monaspace Krypton-->
<font name="MonaspaceKrypton">
@@ -422,9 +445,9 @@
<font_size name="Monospace" font="MonaspaceKrypton" size="8.0" />
<font_size name="Huge" font="MonaspaceKrypton" size="16.0" />
- <font_size name="Large" font="MonaspaceKrypton" size="11.6" />
- <font_size name="Medium" font="MonaspaceKrypton" size="9.6" />
- <font_size name="Small" font="MonaspaceKrypton" size="8.6" />
+ <font_size name="Large" font="MonaspaceKrypton" size="11.4" />
+ <font_size name="Medium" font="MonaspaceKrypton" size="9.4" />
+ <font_size name="Small" font="MonaspaceKrypton" size="8.4" />
<!--Monaspace Neon-->
<font name="MonaspaceNeon">
@@ -445,9 +468,9 @@
<font_size name="Monospace" font="MonaspaceNeon" size="8.0" />
<font_size name="Huge" font="MonaspaceNeon" size="16.0" />
- <font_size name="Large" font="MonaspaceNeon" size="11.6" />
- <font_size name="Medium" font="MonaspaceNeon" size="9.6" />
- <font_size name="Small" font="MonaspaceNeon" size="8.6" />
+ <font_size name="Large" font="MonaspaceNeon" size="11.4" />
+ <font_size name="Medium" font="MonaspaceNeon" size="9.4" />
+ <font_size name="Small" font="MonaspaceNeon" size="8.4" />
<!--Monaspace Xenon-->
<font name="MonaspaceXenon">
@@ -468,9 +491,9 @@
<font_size name="Monospace" font="MonaspaceXenon" size="8.0" />
<font_size name="Huge" font="MonaspaceXenon" size="16.0" />
- <font_size name="Large" font="MonaspaceXenon" size="11.6" />
- <font_size name="Medium" font="MonaspaceXenon" size="9.6" />
- <font_size name="Small" font="MonaspaceXenon" size="8.6" />
+ <font_size name="Large" font="MonaspaceXenon" size="11.4" />
+ <font_size name="Medium" font="MonaspaceXenon" size="9.4" />
+ <font_size name="Small" font="MonaspaceXenon" size="8.4" />
<!--Noto Sans Mono-->
<font name="NotoSansMono">
@@ -479,9 +502,9 @@
<font_size name="Monospace" font="NotoSansMono" size="8.0" />
<font_size name="Huge" font="NotoSansMono" size="16.0" />
- <font_size name="Large" font="NotoSansMono" size="11.6" />
- <font_size name="Medium" font="NotoSansMono" size="9.6" />
- <font_size name="Small" font="NotoSansMono" size="8.6" />
+ <font_size name="Large" font="NotoSansMono" size="11.4" />
+ <font_size name="Medium" font="NotoSansMono" size="9.4" />
+ <font_size name="Small" font="NotoSansMono" size="8.4" />
<!--OpenDyslexicMono-->
<font name="OpenDyslexicMono">
@@ -490,9 +513,9 @@
<font_size name="Monospace" font="OpenDyslexicMono" size="8.0" />
<font_size name="Huge" font="OpenDyslexicMono" size="16.0" />
- <font_size name="Large" font="OpenDyslexicMono" size="11.6" />
- <font_size name="Medium" font="OpenDyslexicMono" size="9.6" />
- <font_size name="Small" font="OpenDyslexicMono" size="8.6" />
+ <font_size name="Large" font="OpenDyslexicMono" size="11.4" />
+ <font_size name="Medium" font="OpenDyslexicMono" size="9.4" />
+ <font_size name="Small" font="OpenDyslexicMono" size="8.4" />
<!--Source Code Pro-->
<font name="SourceCodePro">
@@ -513,9 +536,9 @@
<font_size name="Monospace" font="SourceCodePro" size="8.0" />
<font_size name="Huge" font="SourceCodePro" size="16.0" />
- <font_size name="Large" font="SourceCodePro" size="11.6" />
- <font_size name="Medium" font="SourceCodePro" size="9.6" />
- <font_size name="Small" font="SourceCodePro" size="8.6" />
+ <font_size name="Large" font="SourceCodePro" size="11.4" />
+ <font_size name="Medium" font="SourceCodePro" size="9.4" />
+ <font_size name="Small" font="SourceCodePro" size="8.4" />
<!--Ubuntu Mono-->
<font name="UbuntuMono">
@@ -536,7 +559,7 @@
<font_size name="Monospace" font="UbuntuMono" size="8.0" />
<font_size name="Huge" font="UbuntuMono" size="16.0" />
- <font_size name="Large" font="UbuntuMono" size="11.6" />
- <font_size name="Medium" font="UbuntuMono" size="9.6" />
- <font_size name="Small" font="UbuntuMono" size="8.6" />
+ <font_size name="Large" font="UbuntuMono" size="11.4" />
+ <font_size name="Medium" font="UbuntuMono" size="9.4" />
+ <font_size name="Small" font="UbuntuMono" size="8.4" />
</fonts>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat_general.xml
index dc7dc9e924a02ef93178bc0627b47199f6764e96..29a7f639c63ba8429e7acaa4f752ad2a0bfd91ec 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat_general.xml
@@ -73,13 +73,112 @@
[https://accounts.secondlife.com/change_email Open email notification settings for offline IMs]
</text>
+ <text
+ layout="topleft"
+ follows="left|top"
+ left="280"
+ height="12"
+ name="font_name"
+ width="80"
+ top="0">
+ Font Name:
+ </text>
+
+ <combo_box
+ control_name="ChatFontName"
+ height="23"
+ layout="topleft"
+ follows="left|top"
+ name="chat_font_name"
+ left_pad="5"
+ top_delta="-5"
+ width="120">
+ <item
+ label="IBM Plex"
+ name="IBMPlex"
+ value="IBMPlex"/>
+ <item
+ label="Noto Sans"
+ name="NotoSans"
+ value="NotoSans"/>
+ <item
+ label="Open Dyslexic"
+ name="OpenDyslexic"
+ value="OpenDyslexic"/>
+ <item
+ label="Sans Serif"
+ name="SansSerif"
+ value="SansSerif"/>
+ <item
+ label="Source Sans"
+ name="SourceSans"
+ value="SourceSans"/>
+ <item
+ label="Ubuntu"
+ name="Ubuntu"
+ value="Ubuntu"/>
+ <item
+ label="Cascadia Code"
+ name="CascadiaCode"
+ value="CascadiaCode" />
+ <item
+ label="Fira Code"
+ name="FiraCode"
+ value="FiraCode" />
+ <item
+ label="IBM Plex Mono"
+ name="IBMPlexMono"
+ value="IBMPlexMono"/>
+ <item
+ label="Jetbrains Mono"
+ name="JetbrainsMono"
+ value="JetbrainsMono" />
+ <item
+ label="Monaspace Argon"
+ name="MonaspaceArgon"
+ value="MonaspaceArgon" />
+ <item
+ label="Monaspace Krypton"
+ name="MonaspaceKrypton"
+ value="MonaspaceKrypton" />
+ <item
+ label="Monaspace Neon"
+ name="MonaspaceNeon"
+ value="MonaspaceNeon" />
+ <item
+ label="Monaspace Xenon"
+ name="MonaspaceXenon"
+ value="MonaspaceXenon" />
+ <item
+ label="Monospace"
+ name="Monospace"
+ value="Monospace" />
+ <item
+ label="Noto Sans Mono"
+ name="NotoSansMono"
+ value="NotoSansMono" />
+ <item
+ label="Open Dyslexic Mono"
+ name="OpenDyslexicMono"
+ value="OpenDyslexicMono" />
+ <item
+ label="Source Code Pro"
+ name="SourceCodePro"
+ value="SourceCodePro" />
+ <item
+ label="Ubuntu Mono"
+ name="UbuntuMono"
+ value="UbuntuMono" />
+ </combo_box>
+
<text
layout="topleft"
- left="345"
+ follows="left|top"
+ left="280"
height="12"
name="font_size"
- width="120"
- top="0">
+ width="80"
+ top_pad="7">
Font size:
</text>
@@ -87,10 +186,11 @@
control_name="ChatFontSize"
height="23"
layout="topleft"
- left="341"
+ follows="left|top"
name="chat_font_size"
- top_pad="5"
- width="100">
+ left_pad="5"
+ top_delta="-5"
+ width="120">
<item
label="Monospace"
name="Monospace"
@@ -118,8 +218,8 @@
height="16"
label="Bubble Chat"
layout="topleft"
- top_pad="4"
- left_delta="0"
+ top_pad="5"
+ left_delta="-5"
name="bubble_text_chat"
width="330">
</check_box>
diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 87e9d4a0c16336f6060dadf73d570c9c8187dd09..a3337959d38277240ee3d4a2aeafb0389e04ff01 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -167,6 +167,7 @@
<combo_box
height="23"
layout="topleft"
+ follows="top|left"
left="10"
name="combobox matmedia"
top_pad="5"
@@ -380,6 +381,7 @@
visible="false"
height="23"
layout="topleft"
+ follows="top|left"
left_delta="0"
name="combobox alphamode"
top_pad="4"
@@ -461,6 +463,7 @@
visible="false"
height="23"
layout="topleft"
+ follows="top|left"
left_delta="0"
name="combobox bumpiness"
top_pad="4"
@@ -575,6 +578,7 @@
<combo_box
height="23"
layout="topleft"
+ follows="left|top"
left_pad="11"
name="combobox shininess"
top_delta="-6"
@@ -626,7 +630,7 @@
increment="1"
layout="topleft"
top_delta="-4"
- left_pad="6"
+ left_pad="11"
name="glossiness"
width="69" />
<text
@@ -635,7 +639,7 @@
follows="left|top"
height="10"
layout="topleft"
- left_delta="-122"
+ left_delta="-127"
name="label environment"
text_readonly_color="LabelDisabledColor"
top_pad="8"
@@ -652,7 +656,7 @@
initial_value="0"
layout="topleft"
top_delta="-4"
- left_pad="6"
+ left_pad="11"
name="environment"
width="69" />
<text
@@ -661,7 +665,7 @@
follows="left|top"
height="10"
layout="topleft"
- left_delta="-122"
+ left_delta="-127"
name="label shinycolor"
text_readonly_color="LabelDisabledColor"
top_pad="8"
@@ -675,7 +679,7 @@
height="45"
label=""
layout="topleft"
- left_pad="6"
+ left_pad="11"
name="shinycolorswatch"
tool_tip="Click to open color picker"
top_delta="-4"
@@ -743,10 +747,11 @@
<combo_box
height="23"
layout="topleft"
+ follows="left|top"
left_pad="5"
name="combobox texgen"
top_pad="-13"
- width="69">
+ width="70">
<combo_box.item
label="Default"
name="Default"
@@ -761,26 +766,26 @@
height="19"
initial_value="0"
label="Horizontal scale"
- label_width="194"
+ label_width="200"
layout="topleft"
left="10"
min_val="-100"
max_val="100"
name="TexScaleU"
top_pad="1"
- width="265" />
+ width="271" />
<spinner
follows="left|top"
height="19"
initial_value="0"
label="Vertical scale"
- label_width="194"
+ label_width="200"
layout="topleft"
left="10"
min_val="-100"
max_val="100"
name="TexScaleV"
- width="265" />
+ width="271" />
<spinner
decimal_digits="1"
follows="left|top"
@@ -788,12 +793,12 @@
initial_value=""
label="Repeats per meter"
layout="topleft"
- label_width="194"
+ label_width="200"
left="10"
max_val="100"
min_val="-100"
name="rptctrl"
- width="265" />
+ width="271" />
<spinner
decimal_digits="2"
follows="left|top"
@@ -802,61 +807,61 @@
initial_value="0"
label="Rotation degrees"
layout="topleft"
- label_width="194"
+ label_width="200"
left="10"
max_val="360"
min_val="-360"
name="TexRot"
- width="265" />
+ width="271" />
<spinner
follows="left|top"
height="19"
initial_value="0"
label="Horizontal offset"
- label_width="194"
+ label_width="200"
layout="topleft"
left="10"
min_val="-1"
max_val="1"
name="TexOffsetU"
- width="265" />
+ width="271" />
<spinner
follows="left|top"
height="19"
initial_value="0"
label="Vertical offset"
- label_width="194"
+ label_width="200"
layout="topleft"
left="10"
min_val="-1"
max_val="1"
name="TexOffsetV"
- width="265" />
+ width="271" />
<spinner
follows="left|top"
height="19"
initial_value="0"
label="Horizontal scale"
- label_width="194"
+ label_width="200"
layout="topleft"
left="10"
min_val="-100"
max_val="100"
name="bumpyScaleU"
top_delta="-115"
- width="265" />
+ width="271" />
<spinner
follows="left|top"
height="19"
initial_value="0"
label="Vertical scale"
- label_width="194"
+ label_width="200"
layout="topleft"
left="10"
min_val="-100"
max_val="100"
name="bumpyScaleV"
- width="265" />
+ width="271" />
<spinner
decimal_digits="2"
follows="left|top"
@@ -866,61 +871,61 @@
initial_value="0"
label="Rotation degrees"
layout="topleft"
- label_width="194"
+ label_width="200"
left="10"
max_val="360"
min_val="-360"
name="bumpyRot"
- width="265" />
+ width="271" />
<spinner
follows="left|top"
height="19"
initial_value="0"
label="Horizontal offset"
- label_width="194"
+ label_width="200"
layout="topleft"
left="10"
min_val="-1"
max_val="1"
name="bumpyOffsetU"
- width="265" />
+ width="271" />
<spinner
follows="left|top"
height="19"
initial_value="0"
label="Vertical offset"
- label_width="194"
+ label_width="200"
layout="topleft"
left="10"
min_val="-1"
max_val="1"
name="bumpyOffsetV"
- width="265" />
+ width="271" />
<spinner
follows="left|top"
height="19"
initial_value="0"
label="Horizontal scale"
- label_width="194"
+ label_width="200"
layout="topleft"
left="10"
min_val="-100"
max_val="100"
name="shinyScaleU"
top_delta="-115"
- width="265" />
+ width="271" />
<spinner
follows="left|top"
height="19"
initial_value="0"
label="Vertical scale"
- label_width="194"
+ label_width="200"
layout="topleft"
left="10"
min_val="-100"
max_val="100"
name="shinyScaleV"
- width="265" />
+ width="271" />
<spinner
decimal_digits="2"
follows="left|top"
@@ -930,98 +935,98 @@
initial_value="0"
label="Rotation degrees"
layout="topleft"
- label_width="194"
+ label_width="200"
left="10"
max_val="360"
min_val="-360"
name="shinyRot"
- width="265" />
+ width="271" />
<spinner
follows="left|top"
height="19"
initial_value="0"
label="Horizontal offset"
- label_width="194"
+ label_width="200"
layout="topleft"
left="10"
min_val="-1"
max_val="1"
name="shinyOffsetU"
- width="265" />
+ width="271" />
<spinner
follows="left|top"
height="19"
initial_value="0"
label="Vertical offset"
- label_width="194"
+ label_width="200"
layout="topleft"
left="10"
min_val="-1"
max_val="1"
name="shinyOffsetV"
- width="265" />
+ width="271" />
<!-- BEGIN PBR Material texture transform parameters -->
<spinner
follows="left|top"
height="19"
initial_value="1"
label="Scale u"
- label_width="194"
+ label_width="200"
layout="topleft"
left="10"
min_val="-100"
max_val="100"
name="gltfTextureScaleU"
top_delta="-115"
- width="265" />
+ width="271" />
<spinner
follows="left|top"
height="19"
initial_value="1"
label="Scale v"
- label_width="194"
+ label_width="200"
layout="topleft"
left="10"
min_val="-100"
max_val="100"
name="gltfTextureScaleV"
- width="265" />
+ width="271" />
<spinner
follows="left|top"
height="19"
initial_value="0"
label="Rotation"
- label_width="194"
+ label_width="200"
layout="topleft"
left="10"
min_val="-360"
max_val="360"
name="gltfTextureRotation"
- width="265" />
+ width="271" />
<spinner
follows="left|top"
height="19"
initial_value="0"
label="Offset u"
- label_width="194"
+ label_width="200"
layout="topleft"
left="10"
min_val="-999"
max_val="999"
name="gltfTextureOffsetU"
- width="265" />
+ width="271" />
<spinner
follows="left|top"
height="19"
initial_value="0"
label="Offset v"
- label_width="194"
+ label_width="200"
layout="topleft"
left="10"
min_val="-999"
max_val="999"
name="gltfTextureOffsetV"
- width="265" />
+ width="271" />
<!-- END PBR Material texture transform parameters -->
<check_box
follows="top|left"
@@ -1048,7 +1053,7 @@
width="199" />
<button
layout="topleft"
- follows="right|top"
+ follows="left|top"
height="23"
left_pad="5"
top_delta="-18"
@@ -1071,9 +1076,9 @@
<button
enabled="true"
layout="topleft"
- follows="right|top"
+ follows="left|top"
height="23"
- left="15"
+ left="10"
top="232"
label="Find All"
name="btn_select_same_diff"
@@ -1086,7 +1091,7 @@
<button
enabled="true"
layout="topleft"
- follows="right|top"
+ follows="left|top"
height="23"
left_delta="0"
label="Find All"
@@ -1100,7 +1105,7 @@
<button
enabled="true"
layout="topleft"
- follows="right|top"
+ follows="left|top"
height="23"
left_delta="0"
label="Find All"
@@ -1114,7 +1119,7 @@
<button
enabled="true"
layout="topleft"
- follows="right|top"
+ follows="left|top"
height="23"
left_delta="0"
label="Find All"