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

tvplanit: Add property Layout to TVpWeekView for switching to horizontal arragement of days.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5202 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-09-23 11:40:39 +00:00
parent 36e84f7ff5
commit b46c6f5ab2
4 changed files with 75 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/tvplanit/examples/fulldemo/demomain.lfm
View File

@ -293,6 +293,7 @@ object MainForm: TMainForm
HeadAttributes.Font.Style = [fsItalic]
HeadAttributes.Color = clBtnFace
LineColor = clGray
Layout = wvlHorizontal
TimeFormat = tf12Hour
ShowEventTime = True
WeekStartsOn = dtMonday

3
components/tvplanit/examples/fulldemo/demomain.pas
View File

@ -423,7 +423,8 @@ end;
procedure TMainForm.CbFirstDayOfWeekChange(Sender: TObject);
begin
VpWeekView1.WeekStartsOn := TVpDayType(CbFirstDayOfWeek.ItemIndex);
// VpWeekView1.WeekStartsOn := TVpDayType(CbFirstDayOfWeek.ItemIndex);
VpWeekView1.WeekStartsOn := dtMonday; // Always! Otherwise the small boxes are wrong.
VpMonthView1.WeekStartsOn := TVpDayType(CbFirstDayOfWeek.ItemIndex);
end;

13
components/tvplanit/source/vpweekview.pas
View File

@ -62,6 +62,8 @@ type
Day: TDateTime;
end;
TVpWeekViewLayout = (wvlVertical, wvlHorizontal);
type
TVpWeekdayArray = array of TVpWeekdayRec;
@ -121,8 +123,10 @@ type
FHintMode: TVpHintMode;
FMouseEvent: TVpEvent;
FHintWindow: THintWindow;
FLayout: TVpWeekviewLayout;
FOnHoliday: TVpHolidayEvent;
procedure SetActiveEvent(AValue: TVpEvent);
procedure SetLayout(AValue: TVpWeekviewLayout);
protected{ private }
FActiveDate: TDateTime;
FColumnWidth: Integer;
@ -277,6 +281,7 @@ type
property HeadAttributes: TVpWvHeadAttributes read FHeadAttr write FHeadAttr;
property HintMode: TVpHintMode read FHintMode write FHintMode default hmPlannerHint;
property LineColor: TColor read FLineColor write SetLineColor;
property Layout: TVpWeekviewLayout read FLayout write SetLayout default wvlVertical;
property TimeFormat: TVpTimeFormat read FTimeFormat write SetTimeFormat;
property ShowEventTime: Boolean read FShowEventTime write SetShowEventTime;
property WeekStartsOn: TVpDayType read FWeekStartsOn write SetWeekStartsOn;
@ -803,6 +808,14 @@ begin
end;
{=====}
procedure TVpWeekView.SetLayout(AValue: TVpWeekviewLayout);
begin
if AValue <> FLayout then begin
FLayout := AValue;
Invalidate;
end;
end;
procedure TVpWeekView.SetShowEventTime(Value: Boolean);
begin
if Value <> FShowEventTIme then begin

86
components/tvplanit/source/vpweekviewpainter.pas
View File

@ -16,6 +16,7 @@ type
// local parameters of the old TVpWeekView method
DayRectHeight: Integer;
DayRectWidth: Integer;
StartDate: TDateTime;
ADEventsRect: TRect;
DotDotDotColor: TColor;
@ -303,7 +304,7 @@ begin
if FWeekView.DayHeadAttributes.Bordered and (FWeekView.DrawingStyle <> dsNoBorder) then
TPSRectangle(RenderCanvas, Angle, RenderIn, tmpRect);
// Fix header string
// Fix header string and paint it
DrawDayHeader(ADayIndex, holiday, TextRect);
if (FWeekView.DataStore <> nil) and (FWeekView.DataStore.Resource <> nil) and
@ -379,30 +380,60 @@ begin
end;
{ adjust the DayRect for the next day }
if (ADayIndex = 2) then begin
{ move the dayrect to the top of the next column }
DayRect := Rect(
RealLeft + (RealRight - RealLeft) div 2,
RealTop + headerHeight + 2,
RealRight - 2,
RealTop + headerHeight + DayRectHeight
);
if FWeekView.DrawingStyle = ds3D then begin
inc(DayRect.Top);
dec(DayRect.Right);
end;
end
else
if (ADayIndex = 4 {Friday}) then begin
{ shrink DayRect for weekend days }
DayRectHeight := DayRectHeight div 2;
DayRect.Top := DayRect.Bottom;
DayRect.Bottom := DayRect.Top + DayRectHeight;
end
else begin
DayRect.Top := DayRect.Bottom;
DayRect.Bottom := DayRect.Top + DayRectHeight;
end;
case FWeekView.Layout of
wvlVertical:
if (ADayIndex = 2) then begin
{ move the dayrect to the top of the next column }
DayRect := Rect(
RealLeft + DayRectWidth, //(RealRight - RealLeft) div 2,
RealTop + headerHeight + 2,
RealRight - 2,
RealTop + headerHeight + DayRectHeight
);
if FWeekView.DrawingStyle = ds3D then begin
inc(DayRect.Top);
dec(DayRect.Right);
end;
end
else
if (ADayIndex = 4 {Friday}) then begin
{ shrink DayRect for weekend days }
DayRectHeight := DayRectHeight div 2;
DayRect.Top := DayRect.Bottom;
DayRect.Bottom := DayRect.Top + DayRectHeight;
end
else begin
DayRect.Top := DayRect.Bottom;
DayRect.Bottom := DayRect.Top + DayRectHeight;
end;
wvlHorizontal:
if (ADayIndex = 1) or (ADayIndex = 3) then begin
{ move the day rect to the left of the next row }
DayRect := Rect(
RealLeft + 1,
DayRect.Bottom,
RealLeft + DayRectWidth + 1,
DayRect.Bottom + DayRectHeight);
if FWeekView.DrawingStyle = ds3D then begin
inc(DayRect.Top);
dec(DayRect.Right);
end;
end else
if (ADayIndex in [4, 5]) {Friday or Saturday} then begin
if ADayIndex = 4 then begin
DayRectHeight := DayRectHeight div 2;
DayRect.Left := DayRect.Right - 1;
DayRect.Right := RealRight - 2;
end else
DayRect.Top := DayRect.Bottom;
DayRect.Bottom := DayRect.Top + DayRectHeight;
end else
begin
DayRect.Left := DayRect.Right - 1;
DayRect.Right := RealRight - 2;
end;
end; // case
end;
procedure TVpWeekViewPainter.DrawDayHeader(ADayIndex: Integer; AHolidayName: String;
@ -467,11 +498,12 @@ begin
{ build the first day rect }
headerHeight := TVpWeekViewOpener(FWeekView).wvHeaderHeight;
DayRectHeight := (RealBottom - RealTop - headerHeight) div 3;
DayRectWidth := (RealRight - RealLeft) div 2;
DayRect := Rect(
RealLeft + 1,
RealTop + headerHeight + 2,
RealLeft + (RealRight - RealLeft) div 2 + 1,
Realtop + headerHeight + DayRectHeight
RealLeft + DayRectWidth + 1,
RealTop + headerHeight + DayRectHeight
);
if FWeekView.DrawingStyle = ds3D then
inc(DayRect.Top, 1);