diff options
Diffstat (limited to 'indra/llui/lliconctrl.h')
| -rwxr-xr-x[-rw-r--r--] | indra/llui/lliconctrl.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/indra/llui/lliconctrl.h b/indra/llui/lliconctrl.h index e9bdab2d47..8b1092df46 100644..100755 --- a/indra/llui/lliconctrl.h +++ b/indra/llui/lliconctrl.h @@ -30,7 +30,7 @@ #include "lluuid.h" #include "v4color.h" #include "lluictrl.h" -#include "stdenums.h" +#include "lluiimage.h" class LLTextBox; class LLUICtrlFactory; @@ -49,7 +49,10 @@ public: Optional<LLUIImage*> image; Optional<LLUIColor> color; Optional<bool> use_draw_context_alpha; + Optional<S32> min_width, + min_height; Ignored scale_image; + Params(); }; protected: @@ -69,16 +72,14 @@ public: void setColor(const LLColor4& color) { mColor = color; } void setImage(LLPointer<LLUIImage> image) { mImagep = image; } + const LLPointer<LLUIImage> getImage() { return mImagep; } -private: - void setIconImageDrawSize() ; - protected: S32 mPriority; //the output size of the icon image if set. - S32 mDrawWidth ; - S32 mDrawHeight ; + S32 mMinWidth, + mMinHeight; // If set to true (default), use the draw context transparency. // If false, will use transparency returned by getCurrentTransparency(). See STORM-698. |