Changed to default font size

This commit is contained in:
Maximilian Giller 2019-04-08 15:42:30 +02:00
parent 39fa0bce21
commit 0df90b39bc
2 changed files with 7 additions and 7 deletions

View file

@ -4,7 +4,7 @@ from TextDesign import TextDesign
from WeatherColumnDesign import WeatherColumnDesign from WeatherColumnDesign import WeatherColumnDesign
from datetime import date, timedelta, datetime from datetime import date, timedelta, datetime
from SingelDayEventListDesign import SingelDayEventListDesign from SingelDayEventListDesign import SingelDayEventListDesign
from Assets import fonts, colors from Assets import fonts, colors, defaultfontsize
from settings import general_settings from settings import general_settings
numberbox_ypos = 0.15 numberbox_ypos = 0.15
@ -16,7 +16,7 @@ monthbox_width = 1 - numberbox_ypos - monthbox_xpadding
weekday_height = numberbox_height * 0.19 weekday_height = numberbox_height * 0.19
weekday_ypadding = 0.02 weekday_ypadding = 0.02
weathercolumn_y_size = (0.4, 1) weathercolumn_y_size = (0.4, 1)
eventlist_y_fontsize = 0.093 eventlist_static_fontsize = defaultfontsize
eventlist_padding = monthbox_xpadding eventlist_padding = monthbox_xpadding
numberbox_font_color = colors["bg"] numberbox_font_color = colors["bg"]
@ -67,7 +67,7 @@ class DayHeaderDesign (DesignEntity):
monthbox_height = month_height * self.size[1] monthbox_height = month_height * self.size[1]
pos = (box_xpos + box_height + padding, box_ypos + monthbox_height + padding) pos = (box_xpos + box_height + padding, box_ypos + monthbox_height + padding)
size = (self.size[0] - pos[0] - self.weather_column_width, self.size[1] - pos[1] - box_ypos) size = (self.size[0] - pos[0] - self.weather_column_width, self.size[1] - pos[1] - box_ypos)
fontsize = eventlist_y_fontsize * self.size[1] fontsize = eventlist_static_fontsize
rel_dates = [self.date for _ in range(len(events))] rel_dates = [self.date for _ in range(len(events))]
event_list = SingelDayEventListDesign(size, events, fontsize, event_prefix_rel_dates = rel_dates) event_list = SingelDayEventListDesign(size, events, fontsize, event_prefix_rel_dates = rel_dates)

View file

@ -1,7 +1,7 @@
from DesignEntity import DesignEntity from DesignEntity import DesignEntity
from TextDesign import TextDesign from TextDesign import TextDesign
from TableTextDesign import TableTextDesign from TableTextDesign import TableTextDesign
from Assets import wpath, weathericons, tempicon, humicon, windicon, no_response, colors from Assets import wpath, weathericons, tempicon, humicon, windicon, no_response, colors, defaultfontsize
from PIL import Image from PIL import Image
from settings import hours from settings import hours
@ -10,7 +10,7 @@ icon_x_ypos = 0
icon_width = 1 - 2 * icon_xpos icon_width = 1 - 2 * icon_xpos
info_x_height = icon_width * 0.3 info_x_height = icon_width * 0.3
info_x_ypos = icon_x_ypos + icon_width info_x_ypos = icon_x_ypos + icon_width
fontsize_y = 0.1 fontsize_static = defaultfontsize
numbers_x_ypos = icon_x_ypos + icon_width + info_x_height + 0.2 numbers_x_ypos = icon_x_ypos + icon_width + info_x_height + 0.2
numbers_x_ypadding = 0.05 numbers_x_ypadding = 0.05
max_symbol_y_width = 0.15 max_symbol_y_width = 0.15
@ -36,7 +36,7 @@ class WeatherColumnDesign (DesignEntity):
size = (self.size[0], height) size = (self.size[0], height)
pos = (0, ypos) pos = (0, ypos)
txt = TextDesign(size, text=info, fontsize=height, horizontalalignment="center") txt = TextDesign(size, text=info, fontsize=fontsize_static, horizontalalignment="center")
txt.pos = pos txt.pos = pos
self.draw_design(txt) self.draw_design(txt)
@ -51,7 +51,7 @@ class WeatherColumnDesign (DesignEntity):
[ humidity ], [ humidity ],
[ windspeed ] ] [ windspeed ] ]
fontsize = fontsize_y * self.size[1] fontsize = fontsize_static
ypos = numbers_x_ypos * self.size[0] ypos = numbers_x_ypos * self.size[0]
pos = (0, ypos) pos = (0, ypos)
size = (self.size[0], self.size[1] - pos[1]) size = (self.size[0], self.size[1] - pos[1])