pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

mbColorLib: Fix hints not appearing after re-entry of ColorPalette and HexaColorPicker

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5520 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-12-16 18:47:15 +00:00
parent 90314c0876
commit de18ef6bad
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/mbColorLib/HexaColorPicker.pas
View File

@@ -1002,6 +1002,7 @@ procedure THexaColorPicker.CMHintShow(
var var
Index: Integer; Index: Integer;
Colors: TCombArray; Colors: TCombArray;
cp: TPoint;
begin begin
Colors := nil; Colors := nil;
if (GetColorUnderCursor <> clNone) or PtInRect(FSliderRect, Point(mX, mY)) then if (GetColorUnderCursor <> clNone) or PtInRect(FSliderRect, Point(mX, mY)) then
@@ -1015,9 +1016,11 @@ begin
begin begin
// show that we want a hint // show that we want a hint
Result := 0; Result := 0;
ReshowTimeout := 1; cp := CursorPos;
ReshowTimeout := 0; //1;
HideTimeout := 5000; HideTimeout := 5000;
if PtInRect(FSliderRect, Point(CursorPos.X, CursorPos.Y)) and FSliderVisible then HintInfo^.CursorRect := Rect(cp.X, cp.Y, cp.X+1, cp.Y+1);
if PtInRect(FSliderRect, cp) and FSliderVisible then
begin begin
// in case of the intensity slider we show the current intensity // in case of the intensity slider we show the current intensity
HintStr := FIntensityText + Format(': %d%%', [Round(100 * FCenterIntensity)]); HintStr := FIntensityText + Format(': %d%%', [Round(100 * FCenterIntensity)]);

5
components/mbColorLib/mbColorPalette.pas
View File

@@ -1012,6 +1012,7 @@ procedure TmbColorPalette.CMHintShow(
var var
clr: TColor; clr: TColor;
Handled: boolean; Handled: boolean;
cp: TPoint;
begin begin
if (Colors.Count > 0) and (FIndex > -1) then if (Colors.Count > 0) and (FIndex > -1) then
with TCMHintShow(Message) do with TCMHintShow(Message) do
@@ -1024,7 +1025,9 @@ begin
begin begin
// show that we want a hint // show that we want a hint
Result := 0; Result := 0;
ReshowTimeout := 1; ReshowTimeout := 0; //1;
cp := CursorPos;
HintInfo^.CursorRect := Rect(cp.X, cp.Y, cp.X+1, cp.Y+1);
HideTimeout := Application.HintHidePause; // was: 5000 HideTimeout := Application.HintHidePause; // was: 5000
clr := GetColorUnderCursor; clr := GetColorUnderCursor;
//fire event //fire event