DrawButtonFace(): Improved the look of Flat=True buttons

Flat=True (toolbar) style buttons now have a thinner border when
the mouse hovers over them. They also have an improved look in
Down=True state.

1 files changed, 22 insertions, 4 deletions

diff --git a/src/corelib/fpg_main.pas b/src/corelib/fpg_main.pas
index a83c5590..5505359a 100644
--- a/src/corelib/fpg_main.pas
+++ b/src/corelib/fpg_main.pas
@@ -1759,7 +1759,12 @@ begin
     if (btfIsEmbedded in AFlags) then
       ACanvas.SetColor(clHilite2)
     else
-      ACanvas.SetColor(clShadow2);
+    begin
+      if (btfFlat in AFlags) or (btfHover in AFlags) then
+        ACanvas.SetColor(clShadow1)  { light shadow }
+      else
+        ACanvas.SetColor(clShadow2); { dark shadow }
+    end;
   end
   else
     ACanvas.SetColor(clHilite2);
@@ -1781,14 +1786,27 @@ begin
     if (btfIsEmbedded in AFlags) then
       ACanvas.SetColor(clHilite1)
     else
-      ACanvas.SetColor(clShadow2);
+    begin
+      if (btfFlat in AFlags) or (btfHover in AFlags) then
+        ACanvas.SetColor(clHilite2)  { light shadow }
+      else
+        ACanvas.SetColor(clShadow2); { dark shadow }
+    end;
   end
   else
-    ACanvas.SetColor(clShadow2);
-    
+  begin
+    if btfHover in AFlags then
+      ACanvas.SetColor(clShadow1)  { light shadow }
+    else
+      ACanvas.SetColor(clShadow2); { dark shadow }
+  end;
+
   ACanvas.DrawLine(r.Right, r.Top, r.Right, r.Bottom);   // right
   ACanvas.DrawLine(r.Right, r.Bottom, r.Left-1, r.Bottom);   // bottom
 
+  if (btfFlat in AFlags) or (btfHover in AFlags) then
+    exit; { "toolbar" style buttons need a nice thing/flat border }
+
   // Right and Bottom (inner)
   if btfIsPressed in AFlags then
   begin