TvPlanIt: Improved inplace editor. Scaling of event images in Category combobox if they are too high

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8897 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2023-07-22 17:41:38 +00:00
parent 45d2ee6485
commit 96e0ace939
8 changed files with 107 additions and 52 deletions

View File

@ -1119,13 +1119,13 @@ begin
begin
{$IFDEF REGION_SUPPORT}
WorkRegion1 := CreateRectRgn(AIconRect.Right + FScaledTextMargin, AEventRect.Top, AEventRect.Right, AIconRect.Bottom);
WorkRegion2 := CreateRectRgn(AEventRect.Left + FScaledGutterWidth, AIconRect.Bottom, AEventRect.Right, AEventRect.Bottom);
WorkRegion2 := CreateRectRgn(AEventRect.Left + FScaledIconMargin, AIconRect.Bottom, AEventRect.Right, AEventRect.Bottom);
TextRegion := CreateRectRgn(AIconRect.Right, AEventRect.Top, AEventRect.Right, AIconRect.Bottom);
CombineRgn(TextRegion, WorkRegion1, WorkRegion2, RGN_OR);
{$ELSE}
SetLength(TextRects, 2);
TextRects[0] := Rect(AIconRect.Right + FScaledTextMargin, AEventRect.Top, AEventRect.Right, AIconRect.Bottom);
TextRects[1] := Rect(AEventRect.Left + FScaledGutterWidth, AIconRect.Bottom, AEventRect.Right, AEventRect.Bottom);
TextRects[1] := Rect(AEventRect.Left + FScaledIconMargin, AIconRect.Bottom, AEventRect.Right, AEventRect.Bottom);
{$ENDIF}
end else
begin
@ -1661,7 +1661,7 @@ begin
{$ENDIF}
if Event.AlarmSet then begin
if (FDayView.IconAttributes.AlarmImageIndex > -1) and (imgList <> nil) then
if (imgList <> nil) and Between(FDayView.IconAttributes.AlarmImageIndex, 0, imgList.Count-1) then
begin
{$IFDEF LCL}
{$IF LCL_FullVersion >= 1090000}
@ -1680,7 +1680,7 @@ begin
if Event.RepeatCode <> rtNone then
begin
if (FDayView.IconAttributes.RecurringImageIndex > -1) and (imgList <> nil) then
if (imgList <> nil) and Between(FDayView.IconAttributes.RecurringImageIndex, 0, imgList.Count-1) then
begin
{$IFDEF LCL}
{$IF LCL_FullVersion >= 1090000}
@ -1709,7 +1709,7 @@ begin
if Event.Category < 10 then
begin
cat := FDayView.Datastore.CategoryColorMap.GetCategory(Event.Category);
if (cat.ImageIndex > -1) and (imgList <> nil) then
if (imgList <> nil) and Between(cat.ImageIndex, 0, imgList.Count-1) then
begin
{$IFDEF LCL}
{$IF LCL_FullVersion >= 1090000}