From fe50672586d648765caa2951e04d3fe1dd0a8b36 Mon Sep 17 00:00:00 2001 From: Ace Date: Sat, 14 Dec 2019 22:03:33 +0100 Subject: [PATCH 1/2] Updated fontsize for larger letters --- modules/inkycal_agenda.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/inkycal_agenda.py b/modules/inkycal_agenda.py index ccef4b6..6c7b938 100644 --- a/modules/inkycal_agenda.py +++ b/modules/inkycal_agenda.py @@ -10,7 +10,7 @@ from configuration import* from settings import * import arrow -fontsize = 12 +fontsize = 14 show_events = True print_events = False style = 'D MMM YY HH:mm' From 96cba72f539e7486c186c9baa9f39a8ef225da39 Mon Sep 17 00:00:00 2001 From: Ace Date: Sat, 14 Dec 2019 22:04:52 +0100 Subject: [PATCH 2/2] Dynamic fontsize support It is now possible to select the desired fontsize in the calendar module. --- modules/inkycal_calendar.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/modules/inkycal_calendar.py b/modules/inkycal_calendar.py index 99f7718..a2a2cbe 100644 --- a/modules/inkycal_calendar.py +++ b/modules/inkycal_calendar.py @@ -13,9 +13,12 @@ from PIL import Image, ImageDraw print_events = False show_events = True -max_event_lines = 4 -style = "DD MMM" +fontsize = 16 event_icon = 'square' # dot #square +style = "DD MMM" + +font = ImageFont.truetype(NotoSans+'.ttf', fontsize) +space_between_lines = 1 if show_events == True: from inkycal_icalendar import fetch_events @@ -27,6 +30,9 @@ border_left = int(middle_section_width * 0.02) main_area_height = middle_section_height-border_top*2 main_area_width = middle_section_width-border_left*2 +line_height = font.getsize('hg')[1] + space_between_lines +line_width = middle_section_width - (border_left*2) + """Calculate height for each sub-section""" month_name_height = int(main_area_height*0.1) weekdays_height = int(main_area_height*0.05) @@ -53,9 +59,11 @@ grid = [(grid_start_x + icon_width*x, grid_start_y + icon_height*y) weekday_pos = [(grid_start_x + icon_width*_, middle_section_offset + month_name_height) for _ in range(calendar_coloumns)] +max_event_lines = (events_height - border_top) // (font.getsize('hg')[1] + + space_between_lines) + event_lines = [(border_left,(bottom_section_offset - events_height)+ - int(events_height/max_event_lines*_)) for _ in - range(max_event_lines)] + int(events_height/max_event_lines*_)) for _ in range(max_event_lines)] def main(): try: @@ -156,7 +164,7 @@ def main(): 'HH:mm' if hours == 24 else 'hh:mm'), event.name) for event in calendar_events if event.begin.day == now.replace(days=+1).day] - del event_list[4:] + del event_list[max_lines:] if event_list: for lines in event_list: