Bugfixes

Author: sadko4u

src/main/widgets/graph/Graph.cpp

@@ -513,12 +513,14 @@ namespace lsp
 
         status_t Graph::add(Widget *child)
         {
-            GraphItem *item     = widget_cast<GraphItem>(child);
-            if (item == NULL)
             {
-                GraphEmbed *embed = widget_cast<GraphEmbed>(child);
-                if (embed == NULL)
-                    return STATUS_BAD_TYPE;
+                GraphItem *item     = widget_cast<GraphItem>(child);
+                if (item == NULL)
+                {
+                    GraphEmbed *embed = widget_cast<GraphEmbed>(child);
+                    if (embed == NULL)
+                        return STATUS_BAD_TYPE;
+                }
             }
 
             status_t res = vItems.add(child);
@@ -541,11 +543,17 @@ namespace lsp
 
         status_t Graph::remove(Widget *child)
         {
-            GraphItem *item     = widget_cast<GraphItem>(child);
-            if (item == NULL)
-                return STATUS_BAD_TYPE;
+            {
+                GraphItem *item     = widget_cast<GraphItem>(child);
+                if (item == NULL)
+                {
+                    GraphEmbed *embed = widget_cast<GraphEmbed>(child);
+                    if (embed == NULL)
+                        return STATUS_BAD_TYPE;
+                }
+            }
 
-            status_t res        = vItems.premove(item);
+            status_t res        = vItems.premove(child);
             if (res == STATUS_OK)
             {
                 GraphOrigin *go     = widget_cast<GraphOrigin>(child);

src/main/widgets/graph/GraphEmbed.cpp

@@ -19,6 +19,7 @@
  * along with lsp-tk-lib. If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <lsp-plug.in/common/debug.h>
 #include <lsp-plug.in/tk/tk.h>
 #include <private/tk/style/BuiltinStyle.h>
 
@@ -195,6 +196,8 @@ namespace lsp
             rect.nHeight           -= rect.nTop;
 
             realize_child(cv, &wrect, &rect);
+//            lsp_trace("wrect: x=%d, y=%d, w=%d, h=%d", int(wrect.nLeft), int(wrect.nTop), int(wrect.nWidth), int(wrect.nHeight));
+
             ws::ISurface *ws        = get_surface(s, wrect.nWidth, wrect.nHeight);
             if (ws == NULL)
                 return;