From 910f25a32ce1d287788b0c184a530c2c450391fa Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Thu, 19 Nov 2009 18:41:41 +0200 Subject: fixed EXT-2515 "Docked floaters should be resizeable" undock floater when user resize floater by resize bar; --HG-- branch : product-engine --- indra/llui/llresizebar.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/llui') diff --git a/indra/llui/llresizebar.cpp b/indra/llui/llresizebar.cpp index 304ac64f31..a7cf9be277 100644 --- a/indra/llui/llresizebar.cpp +++ b/indra/llui/llresizebar.cpp @@ -143,6 +143,12 @@ BOOL LLResizeBar::handleHover(S32 x, S32 y, MASK mask) if( valid_rect.localPointInRect( screen_x, screen_y ) && mResizingView ) { + // undock floater when user resize it + if (((LLFloater*)getParent())->isDocked()) + { + ((LLFloater*)getParent())->setDocked(false, false); + } + // Resize the parent LLRect orig_rect = mResizingView->getRect(); LLRect scaled_rect = orig_rect; -- cgit v1.2.3 From 2d9202cb812dec65ec571035389aacd49d19e659 Mon Sep 17 00:00:00 2001 From: Dmitry Oleshko Date: Fri, 20 Nov 2009 16:28:52 +0200 Subject: implemented low task (EXT-1476) Make layouts for Alert, Tip and Script notifications based on XML - made XML-files for the following controls on the panel for alert toasts: button, check box, icon and line editor. - changed creation of these controls in code: from XML vs. from Params in run-time - added getFont method to the LLCheckBox control --HG-- branch : product-engine --- indra/llui/llcheckboxctrl.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/llui') diff --git a/indra/llui/llcheckboxctrl.h b/indra/llui/llcheckboxctrl.h index 2f8e8fdd23..b14e66b915 100644 --- a/indra/llui/llcheckboxctrl.h +++ b/indra/llui/llcheckboxctrl.h @@ -107,6 +107,7 @@ public: std::string getLabel() const; void setFont( const LLFontGL* font ) { mFont = font; } + const LLFontGL* getFont() { return mFont; } virtual void setControlName(const std::string& control_name, LLView* context); -- cgit v1.2.3