Commits

Anonymous committed 7e1e71a

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

Comments (0)

Files changed (2)

indra/llui/llcombobox.cpp

 			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();
 		}

indra/newview/llfloaterwebcontent.cpp

 	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)
 	{