From 4af2d6a0f4d5f5c8c39ad053a3ddadfa0402a92b Mon Sep 17 00:00:00 2001 From: jpbruyere Date: Tue, 2 Feb 2016 11:11:45 +0100 Subject: [PATCH] removed background image --- src/GraphicObjects/GraphicObject.cs | 36 ----------------------------- src/GraphicObjects/Group.cs | 2 -- 2 files changed, 38 deletions(-) diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs index dedbe931..99513f14 100644 --- a/src/GraphicObjects/GraphicObject.cs +++ b/src/GraphicObjects/GraphicObject.cs @@ -360,32 +360,6 @@ namespace Crow { get { return bmp == null ? false : true; } } - [XmlAttributeAttribute()][DefaultValue(null)] - public virtual string BackgroundImagePath { - get { return _backgroundImagePath; } - set { - _backgroundImagePath = value; - if (string.IsNullOrEmpty(_backgroundImagePath)) - return; - - if (_backgroundImagePath.EndsWith (".svg", true, System.Globalization.CultureInfo.InvariantCulture)) - _backgroundImage = new SvgPicture (); - else - _backgroundImage = new BmpPicture (); - - _backgroundImage.LoadImage (_backgroundImagePath); - //_backgroundImage.Scale = false; - registerForGraphicUpdate (); - } - } - [XmlAttributeAttribute()] - public virtual Picture BackgroundImage { - get { return _backgroundImage; } - set { - _backgroundImage = value; - registerForGraphicUpdate (); - } - } [XmlAttributeAttribute()][DefaultValue("0;0")] public virtual Size MaximumSize { get { return _maximumSize; } @@ -419,11 +393,6 @@ namespace Crow } #endregion - /// - /// allow selection of svg subobject to draw in goml, should be improved - /// ex: allow access to backgroundImage.subimg from goml - /// - public string BackImgSub = null; /// /// Loads the default values from XML attributes default @@ -741,11 +710,6 @@ namespace Crow gr.SetSourceColor(Background); CairoHelpers.CairoRectangle(gr,rBack,_cornerRadius); gr.Fill (); - - if (BackgroundImage == null) - return; - - BackgroundImage.Paint (gr, rBack, BackImgSub); } /// diff --git a/src/GraphicObjects/Group.cs b/src/GraphicObjects/Group.cs index ef6e7fc8..034a2616 100644 --- a/src/GraphicObjects/Group.cs +++ b/src/GraphicObjects/Group.cs @@ -188,8 +188,6 @@ namespace Crow protected override void onDraw (Context gr) { Rectangle rBack = new Rectangle (Slot.Size); - if (BackgroundImage != null) - BackgroundImage.Paint (gr, rBack, BackImgSub); gr.SetSourceColor(Background); CairoHelpers.CairoRectangle(gr,rBack,CornerRadius); gr.Fill (); -- 2.47.3