livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXP-1057 FIX Cursor doesn't go to the input field on the Find Floater due to lack of window focus 

also allow right clip to copy url from disabled address bar
meow-7.2.2
Richard Linden 2011-07-29 17:29:02 -07:00
parent feddda6740
commit c7a2f5c4fb
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llui/llcombobox.cpp
View File

@ -791,8 +791,10 @@ BOOL LLComboBox::handleKeyHere(KEY key, MASK mask)
return FALSE;
}
// if selection has changed, pop open list
else if (mList->getLastSelectedItem() != last_selected_item ||
(key == KEY_DOWN || key == KEY_UP) && !mList->isEmpty())
else if (mList->getLastSelectedItem() != last_selected_item
|| ((key == KEY_DOWN || key == KEY_UP)
&& mList->getCanSelect()
&& !mList->isEmpty()))
{
showList();
}

13
indra/newview/llfloaterwebcontent.cpp
View File

@ -223,12 +223,21 @@ void LLFloaterWebContent::open_media(const Params& p)
mWebBrowser->setHomePageUrl(p.url, "text/html");
mWebBrowser->setTarget(p.target);
mWebBrowser->navigateTo(p.url, "text/html");
set_current_url(p.url);
getChild<LLLayoutPanel>("status_bar")->setVisible(p.show_chrome);
getChild<LLLayoutPanel>("nav_controls")->setVisible(p.show_chrome);
getChild<LLUICtrl>("address")->setEnabled(p.allow_address_entry && !p.trusted_content);
bool address_entry_enabled = p.allow_address_entry && !p.trusted_content;
// disable components of combo box so that we can still select and copy text from address bar (a disabled line editor still allows this, but not if its parent is disabled)
getChildView("address")->getChildView("Combo Text Entry")->setEnabled(address_entry_enabled);
getChildView("address")->getChildView("Combobox Button")->setEnabled(address_entry_enabled);
getChildView("address")->getChildView("ComboBox")->setEnabled(address_entry_enabled);
if (!address_entry_enabled)
{
mWebBrowser->setFocus(TRUE);
}
if (!p.show_chrome)
{