Commits

Paul ProductEngine  committed d6c4b78

STORM-357 FIXED Gestures button is in the pressed state after drag-n-drop but gestures list isn't visible.

- Because the Gesture Combo List isn't child of gViewerWindow->getNonSideTrayView(), after focus lost the gesture list becomes hidden under world.
To avoid this, send child to front in each draw.

  • Participants
  • Parent commits aed94e8

Comments (0)

Files changed (2)

File indra/newview/llnearbychatbar.cpp

 	return handled; 		
 }
 
+void LLGestureComboList::draw()
+{
+	LLUICtrl::draw();
+
+	if(mButton->getToggleState())
+	{
+		showList();
+	}
+}
+
 void LLGestureComboList::showList()
 {
 	LLRect rect = mList->getRect();
 	// Show the list and push the button down
 	mButton->setToggleState(TRUE);
 	mList->setVisible(TRUE);
+	sendChildToFront(mList);
 	LLUI::addPopup(mList);
 }
 

File indra/newview/llnearbychatbar.h

 	virtual void	hideList();
 	virtual BOOL	handleKeyHere(KEY key, MASK mask);
 
+	virtual void	draw();
+
 	S32				getCurrentIndex() const;
 	void			onItemSelected(const LLSD& data);
 	void			sortByName(bool ascending = true);