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

test

parent 2b04085f

editor/qml/PropertyPanel.qml

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ ColumnLayout { 
                /* fallback to desktop value when no mobile override exists */

                if (eKey !== field.key && propPanel.currentProps[field.key] !== undefined)

                    return propPanel.currentProps[field.key]

                return field["default"] || ""

                return (field["default"] !== undefined) ? field["default"] : ""

            }

            property bool isMobileOverride: eKey !== field.key

            property bool hasMobileOverride: isMobileOverride && propPanel.currentProps[eKey] !== undefined

editor/widgets/container/container.cpp

+4 −0
Original line number Diff line number Diff line
@@ -273,6 +273,10 @@ extern "C" { 
                addField("margin", "Margin", "text", "e.g. 10px auto", "desktop");

                addField("vertical_align", "Vertical Align", "select", nullptr, "desktop", mkOpts({"top","center","bottom"}));

                addField("hidden", "Hidden", "checkbox", nullptr, "desktop");

                {

                    json_object *hf = json_object_array_get_idx(arr, json_object_array_length(arr) - 1);

                    json_object_object_add(hf, "default", json_object_new_boolean(false));

                }

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

                return arr;

            }