[JVCL-Checkins] SF.net SVN: jvcl: [10679] trunk/jvcl/run/JvNetscapeSplitter.pas

[<ob...@us...>]

Revision: 10679
Author:   obones
Date:     2006-06-09 02:01:49 -0700 (Fri, 09 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/jvcl/?rev=10679&view=rev

Log Message:
-----------
Mantis 3718: Now highlights the buttons regardless of the AllowDrag value.

Modified Paths:
--------------
    trunk/jvcl/run/JvNetscapeSplitter.pas
Modified: trunk/jvcl/run/JvNetscapeSplitter.pas
===================================================================
--- trunk/jvcl/run/JvNetscapeSplitter.pas	2006-06-09 08:18:37 UTC (rev 10678)
+++ trunk/jvcl/run/JvNetscapeSplitter.pas	2006-06-09 09:01:49 UTC (rev 10679)
@@ -1350,23 +1350,27 @@
   if AllowDrag then
   begin
     inherited;
+  end
+  else
+  begin
+    DefaultHandler(Msg); // Bypass TSplitter and just let normal handling occur.
+  end;
 
-    // The order is important here.  ButtonHitTest must be evaluated before
-    // the ButtonStyle because it will change the cursor (over button or not).
-    // If the order were reversed, the cursor would not get set for bsWindows
-    // style since short-circuit Boolean eval would stop it from ever being
-    // called in the first place.
-    if ButtonHitTest(Msg.XPos, Msg.YPos) and (ButtonStyle = bsNetscape) then
-    begin
-      if not FIsHighlighted then
-        PaintButton(True)
-    end
-    else
-    if FIsHighlighted then
-      PaintButton(False);
+  // Mantis 3718: The button is always highlighted whatever value AllowDrag is.
+  
+  // The order is important here.  ButtonHitTest must be evaluated before
+  // the ButtonStyle because it will change the cursor (over button or not).
+  // If the order were reversed, the cursor would not get set for bsWindows
+  // style since short-circuit Boolean eval would stop it from ever being
+  // called in the first place.
+  if ButtonHitTest(Msg.XPos, Msg.YPos) and (ButtonStyle = bsNetscape) then
+  begin
+    if not FIsHighlighted then
+      PaintButton(True)
   end
   else
-    DefaultHandler(Msg); // Bypass TSplitter and just let normal handling occur.
+  if FIsHighlighted then
+    PaintButton(False);
 end;
 
 {$ENDIF VCL}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.