]> O.S.I.I.S - jp/crow.git/commitdiff
removed background image
authorjpbruyere <jp.bruyere@hotmail.com>
Tue, 2 Feb 2016 10:11:45 +0000 (11:11 +0100)
committerjpbruyere <jp.bruyere@hotmail.com>
Tue, 2 Feb 2016 10:12:37 +0000 (11:12 +0100)
src/GraphicObjects/GraphicObject.cs
src/GraphicObjects/Group.cs

index dedbe931a0207845c5e1d1c41997bde2b54cb02c..99513f14ee273c2d62d40b0d612d11161170ac3b 100644 (file)
@@ -360,32 +360,6 @@ namespace Crow
                { get { return bmp == null ? \r
                                false : \r
                                true; } }\r
-               [XmlAttributeAttribute()][DefaultValue(null)]\r
-               public virtual string BackgroundImagePath {\r
-                       get { return _backgroundImagePath; }\r
-                       set { \r
-                               _backgroundImagePath = value;\r
-                               if (string.IsNullOrEmpty(_backgroundImagePath))                                 \r
-                                       return;\r
-\r
-                               if (_backgroundImagePath.EndsWith (".svg", true, System.Globalization.CultureInfo.InvariantCulture)) \r
-                                       _backgroundImage = new SvgPicture ();\r
-                               else \r
-                                       _backgroundImage = new BmpPicture ();\r
-\r
-                               _backgroundImage.LoadImage (_backgroundImagePath);\r
-                               //_backgroundImage.Scale = false;\r
-                               registerForGraphicUpdate ();\r
-                       }\r
-               }\r
-               [XmlAttributeAttribute()]\r
-               public virtual Picture BackgroundImage {\r
-                       get { return _backgroundImage; }\r
-                       set { \r
-                               _backgroundImage = value; \r
-                               registerForGraphicUpdate ();\r
-                       }\r
-               }\r
                [XmlAttributeAttribute()][DefaultValue("0;0")]\r
                public virtual Size MaximumSize {\r
                        get { return _maximumSize; }\r
@@ -419,11 +393,6 @@ namespace Crow
                }\r
                #endregion\r
 \r
-               /// <summary>\r
-               /// allow selection of svg subobject to draw in goml, should be improved\r
-               /// ex: allow access to backgroundImage.subimg from goml\r
-               /// </summary>\r
-               public string BackImgSub = null;\r
 \r
                /// <summary>\r
                /// Loads the default values from XML attributes default\r
@@ -741,11 +710,6 @@ namespace Crow
                        gr.SetSourceColor(Background);\r
                        CairoHelpers.CairoRectangle(gr,rBack,_cornerRadius);\r
                        gr.Fill ();\r
-\r
-                       if (BackgroundImage == null)\r
-                               return;\r
-\r
-                       BackgroundImage.Paint (gr, rBack, BackImgSub);\r
                }\r
 \r
                /// <summary>\r
index ef6e7fc8eb17b207eceba26ef75c2ec0fc553815..034a2616f7a6888f2e60b8bb336ba3c867ea92db 100644 (file)
@@ -188,8 +188,6 @@ namespace Crow
                protected override void onDraw (Context gr)\r
                {\r
                        Rectangle rBack = new Rectangle (Slot.Size);\r
-                       if (BackgroundImage != null)                            \r
-                               BackgroundImage.Paint (gr, rBack, BackImgSub);\r
                        gr.SetSourceColor(Background);\r
                        CairoHelpers.CairoRectangle(gr,rBack,CornerRadius);\r
                        gr.Fill ();\r