Added ipadding property support by the tk::Overlay widget

Author: sadko4u

include/lsp-plug.in/tk/widgets/containers/Overlay.h

@@ -47,6 +47,7 @@ namespace lsp
                 prop::Integer           sShadowSize;        // Shadow size
                 prop::Color             sShadowStart;       // Shadow start color
                 prop::Color             sShadowEnd;         // Shadow end color
+                prop::Padding           sIPadding;          // Internal padding
             LSP_TK_STYLE_DEF_END
         }
 
@@ -87,6 +88,7 @@ namespace lsp
                 prop::Integer           sShadowSize;        // Shadow size
                 prop::Color             sShadowStart;       // Shadow start color
                 prop::Color             sShadowEnd;         // Shadow end color
+                prop::Padding           sIPadding;          // Internal padding
 
                 overlay_position_t      pPosFunc;           // Position calculation function
                 void                   *pPosData;           // Position data function
@@ -141,6 +143,7 @@ namespace lsp
                 LSP_TK_PROPERTY(Integer,            shadow_size,        &sShadowSize)
                 LSP_TK_PROPERTY(Color,              shadow_start,       &sShadowStart)
                 LSP_TK_PROPERTY(Color,              shadow_end,         &sShadowEnd)
+                LSP_TK_PROPERTY(Padding,            ipadding,           &sIPadding)
 
             public:
                 virtual void            draw(ws::ISurface *s, bool force) override;

src/main/widgets/containers/Overlay.cpp

@@ -44,6 +44,7 @@ namespace lsp
                 sShadowSize.bind("shadow.size", this);
                 sShadowStart.bind("shadow.start", this);
                 sShadowEnd.bind("shadow.end", this);
+                sIPadding.bind("ipadding", this);
 
                 // Configure
                 sTransparency.set(0.25f);
@@ -59,6 +60,7 @@ namespace lsp
                 sShadowSize.set(0);
                 sShadowStart.set_rgba32(0x00000000);
                 sShadowEnd.set_rgba32(0xff000000);
+                sIPadding.set_all(0);
 
                 // Override
                 sLayout.override();
@@ -83,7 +85,8 @@ namespace lsp
             sBorderColor(&sProperties),
             sShadowSize(&sProperties),
             sShadowStart(&sProperties),
-            sShadowEnd(&sProperties)
+            sShadowEnd(&sProperties),
+            sIPadding(&sProperties)
         {
             pClass          = &metadata;
 
@@ -117,6 +120,7 @@ namespace lsp
             sShadowSize.bind("shadow.size", &sStyle);
             sShadowStart.bind("shadow.start", &sStyle);
             sShadowEnd.bind("shadow.end", &sStyle);
+            sIPadding.bind("ipadding", &sStyle);
 
             return STATUS_OK;
         }
@@ -151,7 +155,7 @@ namespace lsp
 
             if (prop->one_of(sTransparency, sPriority, sBorderColor))
                 query_draw();
-            if (prop->one_of(sLayout, sConstraints, sPosition, sBorderRadius, sBorderRounding, sBorderSize))
+            if (prop->one_of(sLayout, sConstraints, sPosition, sBorderRadius, sBorderRounding, sBorderSize, sIPadding))
                 query_resize();
         }
 

src/main/widgets/containers/Window.cpp

@@ -1387,16 +1387,15 @@ namespace lsp
 
             // Query for size
             ws::size_limit_t sr;
-            float scaling       = lsp_max(sScaling.get(), 0.0f);
-            size_t border       = lsp_max(0, sBorderSize.get()) * scaling;
+            const float scaling = lsp_max(sScaling.get(), 0.0f);
+            const size_t border = lsp_max(0, sBorderSize.get()) * scaling;
 
             pChild->get_padded_size_limits(&sr);
 
             // Compute size of window without border
-            ws::rectangle_t rc  = *r;
+            ws::rectangle_t rc;
             rc.nLeft            = border;
             rc.nTop             = border;
-
             rc.nWidth           = lsp_max(0, ssize_t(r->nWidth  - border*2));
             rc.nHeight          = lsp_max(0, ssize_t(r->nHeight - border*2));
 
@@ -1417,24 +1416,33 @@ namespace lsp
                     continue;
 
                 // Calculate position of the overlay
+                const float ov_scaling  = lsp_max(0.0f, ov->scaling()->get());
                 ov->get_size_limits(&sr);
                 rc.nLeft        = 0;
                 rc.nTop         = 0;
-                rc.nWidth       = lsp_max(sr.nMinWidth, 1);
-                rc.nHeight      = lsp_max(sr.nMinHeight, 1);
+                rc.nWidth       = lsp_max((sr.nPreWidth > 0) ? sr.nPreWidth : sr.nMinWidth, 1);
+                rc.nHeight      = lsp_max((sr.nPreHeight > 0) ? sr.nPreHeight : sr.nMinHeight, 1);
 
                 ov->position()->get(&rc.nLeft, &rc.nTop);
+                ov->ipadding()->leave(&rc, ov_scaling);
 
-                if (!ov->calculate_position(&rc))
+                // Query position of the overlay widget. Use temporary rectangle to prevent of modifying size of the rectangle
+                ws::rectangle_t qrc     = rc;
+                if (!ov->calculate_position(&qrc))
                 {
                     ov->visibility()->set(false);
                     continue;
                 }
+                rc.nLeft        = qrc.nLeft;
+                rc.nTop         = qrc.nTop;
+
+                // Exclude internal padding now
+                ov->ipadding()->enter(&rc, ov_scaling);
 
                 // Apply window-related padding
                 tk::padding_t padding;
-                const float scaling     = lsp_max(0.0f, ov->scaling()->get());
-                ov->padding()->compute(&padding, scaling);
+
+                ov->padding()->compute(&padding, ov_scaling);
 
                 padding.nRight          = r->nWidth - padding.nRight;
                 padding.nBottom         = r->nHeight - padding.nBottom;