iicd/Inkycal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for 7 rows in Calendar, when the month starts from Sat

Browse Source
This commit is contained in:
Vitali Samurov
2020-08-17 21:54:53 +03:00
parent 0c56339da0
commit ef07e51371
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
inkycal/modules/inkycal_calendar.py
View File

@@ -80,7 +80,14 @@ class Calendar(inkycal_module):
im_width, calendar_height)) im_width, calendar_height))
# Create grid and calculate icon sizes # Create grid and calculate icon sizes
calendar_rows, calendar_cols = 6, 7 now = arrow.now(tz = self.timezone)
monthstart = now.span('month')[0].weekday()
if (monthstart > 4):
calendar_rows, calendar_cols = 7, 7
else:
calendar_rows, calendar_cols = 6, 7
icon_width = im_width // calendar_cols icon_width = im_width // calendar_cols
icon_height = calendar_height // calendar_rows icon_height = calendar_height // calendar_rows
@@ -98,8 +105,6 @@ class Calendar(inkycal_module):
weekday_pos = [(grid_start_x + icon_width*_, month_name_height) for _ in weekday_pos = [(grid_start_x + icon_width*_, month_name_height) for _ in
range(calendar_cols)] range(calendar_cols)]
now = arrow.now(tz = self.timezone)
# Set weekstart of calendar to specified weekstart # Set weekstart of calendar to specified weekstart
if self.weekstart == "Monday": if self.weekstart == "Monday":
cal.setfirstweekday(cal.MONDAY) cal.setfirstweekday(cal.MONDAY)