[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1217
Date       : Tue May 30 20:50:52 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/coldlog.cpp

Fixed ink-dropper button getting stuck down


Diff:
Index: Trunk/XaraLX/Kernel/coldlog.cpp
===================================================================
--- Trunk/XaraLX/Kernel/coldlog.cpp	(revision 1216)
+++ Trunk/XaraLX/Kernel/coldlog.cpp	(revision 1217)
@@ -3275,6 +3275,12 @@
 #endif
 			if (Msg->GadgetID == _R(IDC_COLOURPICKER))
 			{
+				// This little wheeze is enough to remove hover
+				EnableGadget(_R(IDC_COLOURPICKER), FALSE);
+				EnableGadget(_R(IDC_COLOURPICKER), TRUE);
+				SetBoolGadgetSelected(_R(IDC_COLOURPICKER), FALSE);
+				InvalidateGadget(_R(IDC_COLOURPICKER));
+
 				ColourPickerDragInformation * DragCol = new ColourPickerDragInformation();
 				DragManagerOp::StartDrag(DragCol, GetReadWriteWindowID());
 				break;
@@ -3285,12 +3291,6 @@
 			{
 				if (Msg->GadgetID == _R(IDC_EDIT_PICKER))
 				{
-					// This little wheeze is enough to remove hover
-					EnableGadget(_R(IDC_EDIT_PICKER), FALSE);
-					EnableGadget(_R(IDC_EDIT_PICKER), TRUE);
-					SetBoolGadgetSelected(_R(IDC_EDIT_PICKER), FALSE);
-					InvalidateGadget(_R(IDC_EDIT_PICKER));
-
 					StartDrag((ReDrawInfoType*) Msg->DlgMsgParam);
 					NoFillButtonDown = FALSE;
 				}


Xara