[longomatch] Fix draw areas with the selections

[Andoni Morales Alastruey <amorales src gnome org>]

commit 614e26e7040de633a34963e8cc8cc1f07e9a65da
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Mon Oct 13 14:45:30 2014 +0200

    Fix draw areas with the selections

 LongoMatch.Drawing/CanvasObjects/ButtonObject.cs |   23 +++++++++++++++------
 LongoMatch.Drawing/CanvasObjects/CanvasObject.cs |    4 +-
 LongoMatch.Drawing/CanvasObjects/CardObject.cs   |    2 +-
 LongoMatch.Drawing/CanvasObjects/TimerObject.cs  |    2 +-
 LongoMatch.Drawing/Constants.cs                  |    1 -
 5 files changed, 20 insertions(+), 12 deletions(-)
---
diff --git a/LongoMatch.Drawing/CanvasObjects/ButtonObject.cs 
b/LongoMatch.Drawing/CanvasObjects/ButtonObject.cs
index 8c9c779..01674ea 100644
--- a/LongoMatch.Drawing/CanvasObjects/ButtonObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/ButtonObject.cs
@@ -25,6 +25,7 @@ namespace LongoMatch.Drawing.CanvasObjects
        public class ButtonObject: CanvasButtonObject, IMovableObject
        {
                const int BORDER_SIZE = 4;
+               const int SELECTION_SIZE = 6;
 
                public ButtonObject () {
                        BackgroundColor = Config.Style.PaletteBackgroundLight;
@@ -93,6 +94,14 @@ namespace LongoMatch.Drawing.CanvasObjects
                        set;
                }
 
+
+               public virtual Area Area {
+                       get {
+                               return new Area (Position, Width + SELECTION_SIZE / 2 + 1,
+                                                Height + SELECTION_SIZE / 2 + 1);
+                       }
+               }
+
                public TagMode Mode {
                        get;
                        set;
@@ -125,7 +134,7 @@ namespace LongoMatch.Drawing.CanvasObjects
                        return s;
                }
 
-               public void Move (Selection s, Point p, Point start)
+               public virtual void Move (Selection s, Point p, Point start)
                {
                        switch (s.Position) {
                        case SelectionPosition.Right:
@@ -159,17 +168,17 @@ namespace LongoMatch.Drawing.CanvasObjects
                                return;
                        }
                        tk.StrokeColor = Constants.SELECTION_INDICATOR_COLOR;
-                       tk.StrokeColor = Constants.SELECTION_AREA_COLOR;
+                       tk.StrokeColor = Config.Style.PaletteActive;
                        tk.FillColor = null;
                        tk.LineStyle = LineStyle.Dashed;
-                       tk.LineWidth = 1;
+                       tk.LineWidth = 2;
                        tk.DrawRectangle (DrawPosition, Width, Height);
 
                        tk.StrokeColor = tk.FillColor = Constants.SELECTION_INDICATOR_COLOR;
                        tk.LineStyle = LineStyle.Normal;
-                       tk.DrawRectangle (new Point (DrawPosition.X + Width - 3,
-                                                    DrawPosition.Y + Height - 3),
-                                         6, 6);
+                       tk.DrawRectangle (new Point (DrawPosition.X + Width - SELECTION_SIZE / 2,
+                                                    DrawPosition.Y + Height - SELECTION_SIZE / 2),
+                                         SELECTION_SIZE, SELECTION_SIZE);
                }
 
                protected void DrawButton (IDrawingToolkit tk)
@@ -203,7 +212,7 @@ namespace LongoMatch.Drawing.CanvasObjects
 
                public override void Draw (IDrawingToolkit tk, Area area)
                {
-                       if (!UpdateDrawArea (tk, area, new Area (Position, Width, Height))) {
+                       if (!UpdateDrawArea (tk, area, Area)) {
                                return;
                        }
                        tk.Begin ();
diff --git a/LongoMatch.Drawing/CanvasObjects/CanvasObject.cs 
b/LongoMatch.Drawing/CanvasObjects/CanvasObject.cs
index 8bab848..7c8bc48 100644
--- a/LongoMatch.Drawing/CanvasObjects/CanvasObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/CanvasObject.cs
@@ -267,10 +267,10 @@ namespace LongoMatch.Drawing.CanvasObjects
                                return;
                        }
                        tk.StrokeColor = Constants.SELECTION_INDICATOR_COLOR;
-                       tk.StrokeColor = Constants.SELECTION_AREA_COLOR;
+                       tk.StrokeColor = Config.Style.PaletteActive;
                        tk.FillColor = null;
                        tk.LineStyle = LineStyle.Dashed;
-                       tk.LineWidth = 1;
+                       tk.LineWidth = 2;
                        tk.DrawRectangle (area.Start, area.Width, area.Height);
                        foreach (Point p in area.Vertices) {
                                DrawCornerSelection (tk, p);
diff --git a/LongoMatch.Drawing/CanvasObjects/CardObject.cs b/LongoMatch.Drawing/CanvasObjects/CardObject.cs
index 64f3ceb..54fb659 100644
--- a/LongoMatch.Drawing/CanvasObjects/CardObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/CardObject.cs
@@ -37,7 +37,7 @@ namespace LongoMatch.Drawing.CanvasObjects
 
                public override void Draw (IDrawingToolkit tk, Area area)
                {
-                       if (!UpdateDrawArea (tk, area, new Area (Position, Width, Height))) {
+                       if (!UpdateDrawArea (tk, area, Area)) {
                                return;
                        }
                        tk.Begin ();
diff --git a/LongoMatch.Drawing/CanvasObjects/TimerObject.cs b/LongoMatch.Drawing/CanvasObjects/TimerObject.cs
index abe9017..569c8e1 100644
--- a/LongoMatch.Drawing/CanvasObjects/TimerObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/TimerObject.cs
@@ -120,7 +120,7 @@ namespace LongoMatch.Drawing.CanvasObjects
                                h = Button.Height / 2;
                        }
                        
-                       if (!UpdateDrawArea (tk, area, new Area (Position, Width, Height))) {
+                       if (!UpdateDrawArea (tk, area, Area)) {
                                return;
                        };
 
diff --git a/LongoMatch.Drawing/Constants.cs b/LongoMatch.Drawing/Constants.cs
index 31500cd..e25cdd9 100644
--- a/LongoMatch.Drawing/Constants.cs
+++ b/LongoMatch.Drawing/Constants.cs
@@ -43,7 +43,6 @@ namespace LongoMatch.Drawing
                public static Color TIMER_UNSELECTED_COLOR = Color.Blue1;
                public static Color TIMER_SELECTED_COLOR = Color.Red1;
                public static Color SELECTION_INDICATOR_COLOR = Color.Blue1;
-               public static Color SELECTION_AREA_COLOR = Color.Grey1;
                public const int TIMELINE_LINE_WIDTH = 1;
        }
 }