Commit c51e37c3 authored by jan.koester's avatar jan.koester
Browse files

test

parent fc43d3b9

editor/widgets/svg/svg.cpp

+14 −0
Changes for editor/widgets/svg/svg.cpp: 14 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -379,9 +379,11 @@ extern "C" { 
                json_object_object_add(obj, "height", json_object_new_string(height.c_str()));

                json_object_object_add(obj, "border_radius", json_object_new_string(borderRadius.c_str()));

                json_object_object_add(obj, "border_style", json_object_new_string(borderStyle.c_str()));

                json_object_object_add(obj, "vertical_align", json_object_new_string(verticalAlign.c_str()));

                json_object_object_add(obj, "link_url", json_object_new_string(linkUrl.c_str()));

                json_object_object_add(obj, "m_width", json_object_new_string(m_width.c_str()));

                json_object_object_add(obj, "m_height", json_object_new_string(m_height.c_str()));

                json_object_object_add(obj, "m_vertical_align", json_object_new_string(m_verticalAlign.c_str()));

                json_object_object_add(obj, "hidden", json_object_new_boolean(hidden));

                json_object_object_add(obj, "m_hidden", json_object_new_boolean(m_hidden));

                json_object_object_add(obj, "custom_css", json_object_new_string(customCss.c_str()));
@@ -433,6 +435,9 @@ extern "C" { 
                if (json_object_object_get_ex(obj, "border_style", &val_obj)) {

                    val = json_object_get_string(val_obj); if (val) borderStyle = val;

                }

                if (json_object_object_get_ex(obj, "vertical_align", &val_obj)) {

                    val = json_object_get_string(val_obj); if (val) verticalAlign = val;

                }

                if (json_object_object_get_ex(obj, "link_url", &val_obj)) {

                    val = json_object_get_string(val_obj); if (val) linkUrl = val;

                }
@@ -442,6 +447,9 @@ extern "C" { 
                if (json_object_object_get_ex(obj, "m_height", &val_obj)) {

                    val = json_object_get_string(val_obj); if (val) m_height = val;

                }

                if (json_object_object_get_ex(obj, "m_vertical_align", &val_obj)) {

                    val = json_object_get_string(val_obj); if (val) m_verticalAlign = val;

                }

                if (json_object_object_get_ex(obj, "hidden", &val_obj)) {

                    if (json_object_is_type(val_obj, json_type_string)) {

                        const char *s = json_object_get_string(val_obj);
@@ -526,6 +534,10 @@ extern "C" { 
                addField("m_height", "Height (Mobile)", "text", "e.g. auto", "mobile");

                addField("border_radius", "Border Radius", "text", "0");

                addField("border_style", "Border", "text", "e.g. 1px solid #ccc", "desktop");

                addField("vertical_align", "Vertical Align", "select", nullptr, "desktop",

                         mkOpts({"baseline", "top", "middle", "bottom", "text-top", "text-bottom"}));

                addField("m_vertical_align", "Vertical Align (Mobile)", "select", nullptr, "mobile",

                         mkOpts({"baseline", "top", "middle", "bottom", "text-top", "text-bottom"}));

                addField("custom_css", "Custom CSS", "textarea", ".we-xxx { }");



                if (_lang == "de") {
@@ -557,6 +569,7 @@ extern "C" { 
                if (!color.empty()) style += " color: " + color + ";";

                if (borderRadius != "0") style += " border-radius: " + borderRadius + ";";

                if (!borderStyle.empty()) style += " border: " + borderStyle + ";";

                if (!verticalAlign.empty()) style += " vertical-align: " + verticalAlign + ";";

                style += " display: inline-block;";

                if (hidden) style += " display: none;";

                wrapper.setAttribute("style", style.c_str());
@@ -565,6 +578,7 @@ extern "C" { 
                std::string mobileCSS;

                if (!m_width.empty()) mobileCSS += " width: " + m_width + " !important;";

                if (!m_height.empty()) mobileCSS += " height: " + m_height + " !important;";

                if (!m_verticalAlign.empty()) mobileCSS += " vertical-align: " + m_verticalAlign + " !important;";

                if (m_hidden) mobileCSS += " display: none !important;";

                else if (hidden) mobileCSS += " display: inline-block !important;";