Merge branch 'dev' of https://github.com/live-keys/livekeys into dev

Author: dinusv

lib/lveditqmljs/src/qmljssettings.cpp

@@ -62,7 +62,6 @@ QmlJsSettings::QmlJsSettings(EditorSettings *parent)
     m_defaultPalettes["qml/lcvcore#VideoDecoderView"] = "VideoDecoderViewPalette";
     m_defaultPalettes["qml/lcvcore#GrayscaleView"] = "GrayscaleViewPalette";
     m_defaultPalettes["qml/QtQuick#Rectangle"] = "RectangleSizePalette";
-    m_defaultPalettes["qml/lcvcore#Mat"] = "MatPalette";
     MLNode s = parent->readFor("qmljs");
     if ( s.type() == MLNode::Object )
         fromJson(s);

plugins/editqml/qml/EditQmlExtension.qml

@@ -240,8 +240,6 @@ LiveExtension{
         paletteBox.paletteContainerFactory = function(arg){ return root.paletteContainerFactory.createObject(arg) }
 
         editorBox.updatePlacement(rect, cursorCoords, lk.layers.editor.environment.placement.top)
-
-        ef.incrementRefCount()
     }
 
     function palette(){

plugins/editqml/qml/ObjectContainer.qml

@@ -58,46 +58,49 @@ Item{
     function expandDefaultPalette(){
         var defaultPaletteName = editor.documentHandler.codeHandler.defaultPalette(root.editingFragment)
         if ( defaultPaletteName.length ){
-            var editingFragment = root.editingFragment
-            if ( !editingFragment )
-                return
+            expandPalette(defaultPaletteName)
+        }
+    }
 
-            var palette = root.editor.documentHandler.codeHandler.expand(editingFragment, {
-                "palettes" : [defaultPaletteName]
-            })
-            if (palette){
+    function expandPalette(name){
+        var editingFragment = root.editingFragment
+        if ( !editingFragment )
+            return
 
-                if (palette.type === "qml/Object")
-                {
-                    palette.documentHandler = editor.documentHandler
-                    palette.editor = editor
-                    editor.documentHandler.codeHandler.populateNestedObjectsForFragment(editingFragment)
-                    palette.editingFragment = editingFragment
-                }
+        var palette = root.editor.documentHandler.codeHandler.expand(editingFragment, {
+            "palettes" : [name]
+        })
+        if (palette){
 
-                if ( palette.item ){
-                    var newPaletteBox = objectContainer.paletteContainerFactory.createObject(root.paletteGroup)
-                    palette.item.x = 5
-                    palette.item.y = 7
-
-                    newPaletteBox.child = palette.item
-                    newPaletteBox.palette = palette
-
-                    newPaletteBox.name = palette.name
-                    newPaletteBox.type = palette.type
-                    newPaletteBox.moveEnabledSet = false
-                    newPaletteBox.documentHandler = root.editor.documentHandler
-                    newPaletteBox.cursorRectangle = root.paletteGroup.cursorRectangle
-                    newPaletteBox.editorPosition = root.paletteGroup.editorPosition
-                    newPaletteBox.paletteContainerFactory = function(arg){
-                        return objectContainer.paletteContainerFactory.createObject(arg)
-                    }
+            if (palette.type === "qml/Object")
+            {
+                palette.documentHandler = editor.documentHandler
+                palette.editor = editor
+                editor.documentHandler.codeHandler.populateNestedObjectsForFragment(editingFragment)
+                palette.editingFragment = editingFragment
+            }
 
-                    if (compact) expand()
-                } else {
-                    root.expandOptions(palette)
+            if ( palette.item ){
+                var newPaletteBox = objectContainer.paletteContainerFactory.createObject(root.paletteGroup)
+                palette.item.x = 5
+                palette.item.y = 7
+
+                newPaletteBox.child = palette.item
+                newPaletteBox.palette = palette
+
+                newPaletteBox.name = palette.name
+                newPaletteBox.type = palette.type
+                newPaletteBox.moveEnabledSet = false
+                newPaletteBox.documentHandler = root.editor.documentHandler
+                newPaletteBox.cursorRectangle = root.paletteGroup.cursorRectangle
+                newPaletteBox.editorPosition = root.paletteGroup.editorPosition
+                newPaletteBox.paletteContainerFactory = function(arg){
+                    return objectContainer.paletteContainerFactory.createObject(arg)
                 }
 
+                if (compact) expand()
+            } else {
+                root.expandOptions(palette)
             }
 
         }
@@ -273,8 +276,11 @@ Item{
                             paletteBoxGroup.x = 5
 
                             propertyContainer.valueContainer = childObjectContainer
-                            childObjectContainer.expandDefaultPalette()
-
+                            if ( propPalette ){
+                                childObjectContainer.expandPalette(propPalette)
+                            } else {
+                                childObjectContainer.expandDefaultPalette()
+                            }
                             propertyContainer.paletteAddButtonVisible = false
 
                         } else {