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

tvplanit: Improved positioning of hour:minute labels in dayview rowheader

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4978 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-07-15 13:16:55 +00:00
parent 4fbe3969b5
commit 89e4cb68dd
3 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,9 +25,9 @@ object MainForm: TMainForm
Height = 532 Height = 532
Top = 48 Top = 48
Width = 780 Width = 780
ActivePage = TabEvents ActivePage = TabSettings
Align = alClient Align = alClient
TabIndex = 0 TabIndex = 4
TabOrder = 0 TabOrder = 0
object TabEvents: TTabSheet object TabEvents: TTabSheet
Caption = 'Events' Caption = 'Events'
@ -104,6 +104,7 @@ object MainForm: TMainForm
TimeSlotColors.Weekend = 14737632 TimeSlotColors.Weekend = 14737632
TimeSlotColors.ActiveRange.RangeBegin = h_00 TimeSlotColors.ActiveRange.RangeBegin = h_00
TimeSlotColors.ActiveRange.RangeEnd = h_00 TimeSlotColors.ActiveRange.RangeEnd = h_00
HeadAttributes.Font.Height = -13
HeadAttributes.Color = clBtnFace HeadAttributes.Color = clBtnFace
RowHeadAttributes.HourFont.Height = -24 RowHeadAttributes.HourFont.Height = -24
RowHeadAttributes.MinuteFont.Height = -12 RowHeadAttributes.MinuteFont.Height = -12

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

@ -596,7 +596,7 @@ begin
CbAllowInplaceEditing.Checked := ini.ReadBool('Settings', 'AllowInplaceEditing', CbAllowInplaceEditing.Checked); CbAllowInplaceEditing.Checked := ini.ReadBool('Settings', 'AllowInplaceEditing', CbAllowInplaceEditing.Checked);
CbAllowInplaceEditingChange(nil); CbAllowInplaceEditingChange(nil);
CbDrawingStyle.ItemIndex := ini.ReadInteger('Settings', 'DrawingStyle', CbDrawingStyle.ItemIndex); CbDrawingStyle.ItemIndex := ini.ReadInteger('Settings', 'DrawingStyle', ord(dsFlat));
CbDrawingStyleChange(nil); CbDrawingStyleChange(nil);
finally finally

18
components/tvplanit/source/vpdayviewpainter.pas
View File

@ -1418,7 +1418,7 @@ begin
// Draw hours // Draw hours
RenderCanvas.Font.Assign(FDayView.RowHeadAttributes.HourFont); RenderCanvas.Font.Assign(FDayView.RowHeadAttributes.HourFont);
dec(x, RenderCanvas.TextWidth(HourStr) + MINUTES_HOUR_DISTANCE); dec(x, RenderCanvas.TextWidth(HourStr) + MINUTES_HOUR_DISTANCE);
TPSTextOut(RenderCanvas, Angle, RenderIn, x, y + TextMargin - 2, hourStr); TPSTextOut(RenderCanvas, Angle, RenderIn, x, y + TextMargin{ - 2}, hourStr);
end; end;
end; end;
@ -1513,12 +1513,12 @@ begin
end; end;
function TVpDayViewPainter.CalcRowHeadWidth: integer; function TVpDayViewPainter.CalcRowHeadWidth: integer;
var
w: Integer;
begin begin
Result := 2 * MINUTES_BORDER + MINUTES_HOUR_DISTANCE;
RenderCanvas.Font.Assign(FDayView.RowHeadAttributes.MinuteFont);
inc(Result, RenderCanvas.TextWidth('00'));
RenderCanvas.Font.Assign(FDayView.RowHeadAttributes.HourFont); RenderCanvas.Font.Assign(FDayView.RowHeadAttributes.HourFont);
w := RenderCanvas.TextWidth('33'); inc(Result, RenderCanvas.TextWidth('33'));
Result := w * 2 + 10;
end; end;
procedure TVpDayViewPainter.FixFontHeights; procedure TVpDayViewPainter.FixFontHeights;
@ -1722,14 +1722,6 @@ begin
SetMeasurements; SetMeasurements;
{
if DisplayOnly then
ScrollBarOffset := 2
else
ScrollBarOffset := 14;
}
ScrollbarOffset := 0; ScrollbarOffset := 0;
with TVpDayViewOpener(FDayView) do with TVpDayViewOpener(FDayView) do
if ADisplayOnly then begin if ADisplayOnly then begin