From 10899a4c216c8e4bad49d6ead40901f4ac623fd7 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Thu, 23 Jun 2016 08:47:09 +0000
Subject: [PATCH] tvplanit: No bevel in flat mode around a TVpWeekView

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4809 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../tvplanit/examples/demo/demomain.lfm       |  4 ++--
 .../tvplanit/source/vpweekviewpainter.pas     | 21 ++++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/components/tvplanit/examples/demo/demomain.lfm b/components/tvplanit/examples/demo/demomain.lfm
index 0d07f4b3c..43e90731c 100644
--- a/components/tvplanit/examples/demo/demomain.lfm
+++ b/components/tvplanit/examples/demo/demomain.lfm
@@ -25,9 +25,9 @@ object MainForm: TMainForm
       Height = 532
       Top = 48
       Width = 780
-      ActivePage = TabTasks
+      ActivePage = TabEvents
       Align = alClient
-      TabIndex = 1
+      TabIndex = 0
       TabOrder = 0
       object TabEvents: TTabSheet
         Caption = 'Events'
diff --git a/components/tvplanit/source/vpweekviewpainter.pas b/components/tvplanit/source/vpweekviewpainter.pas
index 339010a57..8b50fd69d 100644
--- a/components/tvplanit/source/vpweekviewpainter.pas
+++ b/components/tvplanit/source/vpweekviewpainter.pas
@@ -240,18 +240,21 @@ begin
 end;
 
 procedure TVpWeekViewPainter.DrawBorders;
+var
+  shadow, bright: TColor;
 begin
   if FWeekView.DrawingStyle = dsFlat then begin
-    { draw an outer and inner bevel }
+    {
     DrawBevelRect(RenderCanvas,
       TPSRotateRectangle(Angle, RenderIn, Rect(RealLeft, RealTop, RealRight - 1, RealBottom - 1)),
       BevelShadowColor,
-      BevelHighlightColor
+      BevelShadowColor
     );
+    }
     DrawBevelRect(RenderCanvas,
       TPSRotateRectangle(Angle, RenderIn, Rect(RealLeft + 1, RealTop + 1, RealRight - 2, RealBottom - 2)),
       BevelShadowColor,
-      BevelHighlightColor
+      BevelShadowColor    // use the same color --> no bevel in flat mode!
     );
   end else
   if FWeekView.DrawingStyle = ds3d then begin
@@ -262,7 +265,7 @@ begin
       BevelShadowColor
     );
     DrawBevelRect(RenderCanvas,
-      TPSRotateRectangle(Angle, RenderIn, Rect (RealLeft + 1, RealTop + 1, RealRight - 2, RealBottom - 2)),
+      TPSRotateRectangle(Angle, RenderIn, Rect(RealLeft + 1, RealTop + 1, RealRight - 2, RealBottom - 2)),
       BevelDarkShadow,
       BevelButtonFace
     );
@@ -531,15 +534,19 @@ begin
                    TPSRotateRectangle (Angle, RenderIn, HeadRect),
                    BevelHighlightColor, BevelShadowColor);
     }
-  end else if FWeekView.DrawingStyle = ds3d then begin
+  end else
+  if FWeekView.DrawingStyle = ds3d then begin
     { draw a 3d bevel }
     HeadRect.Left := RealLeft + 2;
     HeadRect.Top := RealTop + 2;
     HeadRect.Right := RealRight - 3;
     HeadRect.Bottom := RealTop + TVpWeekViewOpener(FWeekView).wvHeaderHeight;
     TPSFillRect(RenderCanvas, Angle, RenderIn, HeadRect);
-    DrawBevelRect(RenderCanvas, TPSRotateRectangle(Angle, RenderIn, HeadRect),
-      BevelHighlightColor, BevelDarkShadow
+    DrawBevelRect(
+      RenderCanvas,
+      TPSRotateRectangle(Angle, RenderIn, HeadRect),
+      BevelHighlightColor,
+      BevelDarkShadow
     );
   end else begin
     HeadRect.Left := RealLeft + 1;