Added text clipping function for tk::Label

Author: sadko4u

CHANGELOG

@@ -3,6 +3,7 @@
 *******************************************************************************
 
 === 1.0.29 ===
+* Added text clipping function for tk::Label.
 * Implemented AudioEnvelope widget and it's integration into AudioSample.
 * Implemented ws::IDisplay::get_file_descriptor method for obtaining event loop
   descriptor for Unix-based systems that use X11 protocol

include/lsp-plug.in/tk/widgets/simple/Label.h

@@ -58,6 +58,7 @@ namespace lsp
                 prop::Font                  sFont;          // Font parameters
                 prop::Boolean               sHover;         // Hover enable
                 prop::String                sText;          // Text to display
+                prop::Boolean               sTextClip;      // Clip text
                 prop::SizeConstraints       sConstraints;   // Size constraints
                 prop::Padding               sIPadding;      // Internal padding
             LSP_TK_STYLE_DEF_END
@@ -108,6 +109,7 @@ namespace lsp
                 prop::Font                  sFont;          // Font parameters
                 prop::Boolean               sHover;         // Hover enable
                 prop::String                sText;          // Text to display
+                prop::Boolean               sTextClip;      // Clip text
                 prop::SizeConstraints       sConstraints;   // Size constraints
                 prop::Padding               sIPadding;      // Internal padding
                 prop::WidgetPtr<Menu>       sPopup;         // Popup menu
@@ -153,6 +155,7 @@ namespace lsp
                 LSP_TK_PROPERTY(Color,              inactive_hover_color,   &vColors[LBL_3].sColor)
                 LSP_TK_PROPERTY(Boolean,            hover,                  &sHover)
                 LSP_TK_PROPERTY(String,             text,                   &sText)
+                LSP_TK_PROPERTY(Boolean,            text_clip,              &sTextClip)
                 LSP_TK_PROPERTY(SizeConstraints,    constraints,            &sConstraints)
                 LSP_TK_PROPERTY(Padding,            ipadding,               &sIPadding)
                 LSP_TK_PROPERTY(WidgetPtr<Menu>,    popup,                  &sPopup)

src/main/widgets/simple/Label.cpp

@@ -50,6 +50,7 @@ namespace lsp
 
                 sTextLayout.bind("text.layout", this);
                 sTextAdjust.bind("text.adjust", this);
+                sTextClip.bind("text.clip", this);
                 sFont.bind("font", this);
                 sHover.bind("text.hover", this);
                 sConstraints.bind("size.constraints", this);
@@ -70,6 +71,7 @@ namespace lsp
 
                 sTextLayout.set(0.0f, 0.0f);
                 sTextAdjust.set(TA_NONE);
+                sTextClip.set(false);
                 sFont.set_size(12.0f);
                 sHover.set(false);
                 sConstraints.set(-1, -1, -1, -1);
@@ -97,6 +99,7 @@ namespace lsp
             sFont(&sProperties),
             sHover(&sProperties),
             sText(&sProperties),
+            sTextClip(&sProperties),
             sConstraints(&sProperties),
             sPopup(&sProperties)
         {
@@ -135,6 +138,7 @@ namespace lsp
             sFont.bind("font", &sStyle);
             sHover.bind("text.hover", &sStyle);
             sText.bind(&sStyle, pDisplay->dictionary());
+            sTextClip.bind("text.clip", &sStyle);
             sConstraints.bind("size.constraints", &sStyle);
             sIPadding.bind("ipadding", &sStyle);
             sPopup.bind(NULL);
@@ -159,7 +163,7 @@ namespace lsp
             if (prop->one_of(sTextLayout, sHover))
                 query_draw();
 
-            if (prop->one_of(sTextAdjust, sFont, sText, sConstraints, sIPadding))
+            if (prop->one_of(sTextAdjust, sTextClip, sFont, sText, sConstraints, sIPadding))
                 query_resize();
         }
 
@@ -181,6 +185,22 @@ namespace lsp
             sFont.get_multitext_parameters(s, &tp, fscaling, &text);
             sIPadding.sub(&size, &sSize, scaling);
 
+            // Apply text clipping
+            const bool clip = sTextClip.get();
+            if (clip)
+            {
+                r.nLeft     = 0;
+                r.nTop      = 0;
+                r.nWidth    = sSize.nWidth;
+                r.nHeight   = sSize.nHeight;
+                sIPadding.enter(&r, scaling);
+                s->clip_begin(&r);
+            }
+            lsp_finally {
+                if (clip)
+                    s->clip_end();
+            };
+
             // Estimate drawing area
             tp.Height       = lsp_max(tp.Height, fp.Height);
             if (tp.Width <= size.nWidth)
@@ -347,10 +367,15 @@ namespace lsp
             e.r             = r;
             sFont.get_parameters(pDisplay, e.fscaling, &e.fp);
 
-            // Estimate the size of the label
-            for (lltl::iterator<prop::String> it = vEstimations.values(); it; ++it)
-                estimate_string_size(&e, it.get());
-            estimate_string_size(&e, &sText);
+            if (!sTextClip.get())
+            {
+                // Estimate the size of the label
+                for (lltl::iterator<prop::String> it = vEstimations.values(); it; ++it)
+                    estimate_string_size(&e, it.get());
+                estimate_string_size(&e, &sText);
+            }
+            else
+                r->nMinHeight   = e.fp.Height;
 
             // Apply size constraints
             sConstraints.apply(r, e.scaling);