Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

Browse Source
This commit is contained in:
Latif Khalifa
2014-01-24 01:16:32 +01:00
parent 269deb56e6 7572674fdb
commit 066d0221b8
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llui/llscrollcontainer.cpp
View File

@@ -760,7 +760,7 @@ LLView* LLScrollContainer::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFa
node->getAttributeString("name", name); node->getAttributeString("name", name);
LLRect rect; LLRect rect;
createRect(node, rect, parent, LLRect()); U32 follows_flags = createRect(node, rect, parent, LLRect());
BOOL opaque = FALSE; BOOL opaque = FALSE;
node->getAttributeBOOL("opaque", opaque); node->getAttributeBOOL("opaque", opaque);
@@ -771,6 +771,10 @@ LLView* LLScrollContainer::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFa
// Create the scroll view // Create the scroll view
LLScrollContainer *ret = new LLScrollContainer(name, rect, (LLPanel*)NULL, opaque, color); LLScrollContainer *ret = new LLScrollContainer(name, rect, (LLPanel*)NULL, opaque, color);
// Obey xml follows
ret->setFollows(follows_flags);
ret->parseFollowsFlags(node);
LLPanel* panelp = NULL; LLPanel* panelp = NULL;
// Find a child panel to add // Find a child panel to add

1
indra/llui/lluictrl.h
View File

@@ -209,6 +209,7 @@ public:
BOOL focusNextItem(BOOL text_entry_only); BOOL focusNextItem(BOOL text_entry_only);
BOOL focusPrevItem(BOOL text_entry_only); BOOL focusPrevItem(BOOL text_entry_only);
virtual // Singu Note: focusFirstItem is overridden for our old chat ui to prevent focusing on topmost uictrls.
BOOL focusFirstItem(BOOL prefer_text_fields = FALSE, BOOL focus_flash = TRUE ); BOOL focusFirstItem(BOOL prefer_text_fields = FALSE, BOOL focus_flash = TRUE );
BOOL focusLastItem(BOOL prefer_text_fields = FALSE); BOOL focusLastItem(BOOL prefer_text_fields = FALSE);

4
indra/newview/skins/default/xui/en-us/floater_customize.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-562" can_close="true" can_drag_on_left="false" can_minimize="false" <floater bottom="-562" can_close="true" can_drag_on_left="false" can_minimize="false"
can_resize="false" follows="left|top" height="540" left="12" min_height="0" can_resize="true" follows="left|top" height="540" left="12" min_height="540"
min_width="0" mouse_opaque="true" name="floater customize" min_width="494" mouse_opaque="true" name="floater customize"
rect_control="FloaterCustomizeAppearanceRect" title="Appearance" rect_control="FloaterCustomizeAppearanceRect" title="Appearance"
width="494"> width="494">
<tab_container bottom="-507" height="483" left="0" mouse_opaque="false" <tab_container bottom="-507" height="483" left="0" mouse_opaque="false"