Added text alignment for clipping case

Author: sadko4u

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

@@ -54,6 +54,7 @@ namespace lsp
                 LabelColors                 vColors[LABEL_TOTAL];
 
                 prop::TextLayout            sTextLayout;    // Text layout
+                prop::TextLayout            sClipTextLayout;// Text layout when clipping
                 prop::TextAdjust            sTextAdjust;    // Text adjustment
                 prop::Font                  sFont;          // Font parameters
                 prop::Boolean               sHover;         // Hover enable
@@ -105,6 +106,7 @@ namespace lsp
 
                 style::LabelColors          vColors[style::LABEL_TOTAL];
                 prop::TextLayout            sTextLayout;    // Text layout
+                prop::TextLayout            sClipTextLayout;// Text layout when clipping
                 prop::TextAdjust            sTextAdjust;    // Text adjustment
                 prop::Font                  sFont;          // Font parameters
                 prop::Boolean               sHover;         // Hover enable
@@ -147,6 +149,7 @@ namespace lsp
 
             public:
                 LSP_TK_PROPERTY(TextLayout,         text_layout,            &sTextLayout)
+                LSP_TK_PROPERTY(TextLayout,         clip_text_layout,       &sClipTextLayout)
                 LSP_TK_PROPERTY(TextAdjust,         text_adjust,            &sTextAdjust)
                 LSP_TK_PROPERTY(Font,               font,                   &sFont)
                 LSP_TK_PROPERTY(Color,              color,                  &vColors[LBL_0].sColor)

src/main/widgets/simple/Label.cpp

@@ -49,6 +49,7 @@ namespace lsp
                 c->sColor.bind("inactive.text.hover.color", this);
 
                 sTextLayout.bind("text.layout", this);
+                sClipTextLayout.bind("text.clip.layout", this);
                 sTextAdjust.bind("text.adjust", this);
                 sTextClip.bind("text.clip", this);
                 sFont.bind("font", this);
@@ -70,6 +71,7 @@ namespace lsp
                 c->sColor.set_rgb24(0xcc0000);
 
                 sTextLayout.set(0.0f, 0.0f);
+                sClipTextLayout.set(0.0f, 0.0f);
                 sTextAdjust.set(TA_NONE);
                 sTextClip.set(false);
                 sFont.set_size(12.0f);
@@ -95,6 +97,7 @@ namespace lsp
         Label::Label(Display *dpy):
             Widget(dpy),
             sTextLayout(&sProperties),
+            sClipTextLayout(&sProperties),
             sTextAdjust(&sProperties),
             sFont(&sProperties),
             sHover(&sProperties),
@@ -134,6 +137,7 @@ namespace lsp
             c->sColor.bind("inactive.text.hover.color", &sStyle);
 
             sTextLayout.bind("text.layout", &sStyle);
+            sClipTextLayout.bind("text.clip.layout", &sStyle);
             sTextAdjust.bind("text.adjust", &sStyle);
             sFont.bind("font", &sStyle);
             sHover.bind("text.hover", &sStyle);
@@ -160,7 +164,7 @@ namespace lsp
             if (colors->property_changed(prop))
                 query_draw();
 
-            if (prop->one_of(sTextLayout, sHover))
+            if (prop->one_of(sTextLayout, sClipTextLayout, sHover))
                 query_draw();
 
             if (prop->one_of(sTextAdjust, sTextClip, sFont, sText, sConstraints, sIPadding))
@@ -239,9 +243,12 @@ namespace lsp
             // Draw background
             s->clear(bg_color);
 
+            const bool exceeds = (tp.Width > r.nWidth) || (tp.Height > r.nHeight);
+            const TextLayout *layout = (exceeds) ? &sClipTextLayout : &sTextLayout;
+
             draw_multiline_text(s,
                 &sFont, &r, f_color, &fp, &tp,
-                sTextLayout.halign(), sTextLayout.valign(),
+                layout->halign(), layout->valign(),
                 fscaling, &text);
         }