From 32ce71dd6e83ac8c95f74c5120382661a68fc252 Mon Sep 17 00:00:00 2001 From: Paul Guslisty Date: Fri, 21 May 2010 19:16:51 +0300 Subject: EXT-6658 FIXED Fixed text overflow and truncation - Made more vertical space between radio group and status text to avoid overlapping - Moved by 5 pixels to the left \"checkbox fullbright\" checkbox to avoid trancation - Replaced checkbox's label with TextBox to have ability to apply word_wrap for truncated label Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/430/ --HG-- branch : product-engine --- indra/newview/llfloatertools.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/llfloatertools.cpp') diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index d8d7057c4e..a42f6ee00f 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -237,6 +237,7 @@ BOOL LLFloaterTools::postBuild() childSetValue("checkbox stretch textures",(BOOL)gSavedSettings.getBOOL("ScaleStretchTextures")); mTextGridMode = getChild("text ruler mode"); mComboGridMode = getChild("combobox grid mode"); + mCheckStretchUniformLabel = getChild("checkbox uniform label"); // // Create Buttons @@ -316,6 +317,7 @@ LLFloaterTools::LLFloaterTools(const LLSD& key) mComboGridMode(NULL), mCheckStretchUniform(NULL), mCheckStretchTexture(NULL), + mCheckStretchUniformLabel(NULL), mBtnRotateLeft(NULL), mBtnRotateReset(NULL), @@ -632,6 +634,7 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask) //mCheckSelectLinked ->setVisible( edit_visible ); if (mCheckStretchUniform) mCheckStretchUniform->setVisible( edit_visible ); if (mCheckStretchTexture) mCheckStretchTexture->setVisible( edit_visible ); + if (mCheckStretchUniformLabel) mCheckStretchUniformLabel->setVisible( edit_visible ); // Create buttons BOOL create_visible = (tool == LLToolCompCreate::getInstance()); -- cgit v1.3