Add flag to enable line editor style left clicks on name editors
Enable this flag on the profile name editor, but not the partner one.
This commit is contained in:
@@ -59,7 +59,7 @@ LLNameEditor::LLNameEditor(const std::string& name, const LLRect& rect,
|
||||
// virtual
|
||||
BOOL LLNameEditor::handleMouseDown(S32 x, S32 y, MASK mask)
|
||||
{
|
||||
if (mAllowInteract)
|
||||
if (mClickForProfile && mAllowInteract)
|
||||
{
|
||||
showProfile();
|
||||
return true;
|
||||
@@ -125,10 +125,13 @@ LLView* LLNameEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
|
||||
node->getAttributeString("label", loading);
|
||||
bool rlv_sensitive = false;
|
||||
node->getAttribute_bool("rlv_sensitive", rlv_sensitive);
|
||||
bool click_for_profile = true;
|
||||
node->getAttribute_bool("click_for_profile", click_for_profile);
|
||||
|
||||
LLNameEditor* line_editor = new LLNameEditor("name_editor",
|
||||
rect,
|
||||
id, is_group, loading, rlv_sensitive,
|
||||
click_for_profile,
|
||||
LLView::selectFont(node),
|
||||
max_text_length);
|
||||
|
||||
|
||||
@@ -40,12 +40,14 @@ class LLNameEditor
|
||||
: public LLLineEditor
|
||||
, public LLNameUI
|
||||
{
|
||||
bool mClickForProfile;
|
||||
public:
|
||||
LLNameEditor(const std::string& name, const LLRect& rect,
|
||||
const LLUUID& name_id = LLUUID::null,
|
||||
bool is_group = false,
|
||||
const std::string& loading = LLStringUtil::null,
|
||||
bool rlv_sensitive = false,
|
||||
bool click_for_profile = true,
|
||||
const LLFontGL* glfont = nullptr,
|
||||
S32 max_text_length = 254);
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
border_thickness="1" bottom="-48" enabled="false" follows="left|top"
|
||||
font="SansSerifSmall" height="16" is_unicode="false" left_delta="75"
|
||||
max_length="254" mouse_opaque="false" name="dnname"
|
||||
width="181" />
|
||||
width="181" click_for_profile="false"/>
|
||||
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
|
||||
bottom="-48" drop_shadow_visible="true" follows="left|top"
|
||||
font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="185"
|
||||
|
||||
Reference in New Issue
Block a user