laantungir/seedsigner
1
0
Fork 0
mirror of https://github.com/SeedSigner/seedsigner.git synced 2026-10-05 15:08:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #485 from newtonick/pillow-getsize-deprecations

Browse Source 
Fix Deprecations related to font.getsize in Pillow
This commit is contained in:
Nick Klockenga
2024-02-22 20:50:46 -05:00
committed by GitHub
parent db16fa77f8 4e163fcadb
commit 69cb6ac7ff
4 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/seedsigner/gui/components.py
+2 -1
View File
@@ -610,7 +610,8 @@ class FormattedAddress(BaseComponent):
self.accent_font = Fonts.get_font(GUIConstants.FIXED_WIDTH_EMPHASIS_FONT_NAME, self.font_size)
# Fixed width font means we only have to measure one max-height character
char_width, char_height = self.font.getsize("Q")
left, top, right, bottom = self.font.getbbox("Q")
char_width, char_height = right - left, bottom - top
n = 7
display_str = f"{self.address[:n]} {self.address[n:-1*n]} {self.address[-1*n:]}"
src/seedsigner/gui/keyboard.py
+4 -2
View File
@@ -591,7 +591,8 @@ class TextEntryDisplay(TextEntryDisplayConstants):
if end_pos_x < self.width:
# The entire cur_text plus the cursor bar fits
self.text_offset = 3 + cursor_bar_serif_half_width
tw_left, th = self.font.getsize(self.cur_text[:cursor_position])
left, top, right, bottom = self.font.getbbox(self.cur_text[:cursor_position])
tw_left, th = right - left, bottom - top
cursor_bar_x = self.text_offset + tw_left
else:
@@ -599,7 +600,8 @@ class TextEntryDisplay(TextEntryDisplayConstants):
cursor_position = len(self.cur_text)
# Is the cursor at either extreme?
tw_left, th = self.font.getsize(self.cur_text[:cursor_position])
left, top, right, bottom = self.font.getbbox(self.cur_text[:cursor_position])
tw_left, th = right - left, bottom - top
if self.text_offset + tw_left + cursor_bar_serif_half_width + 3 >= self.width:
# Cursor is at the extreme right; have to push the full tw_right off
src/seedsigner/gui/screens/psbt_screens.py
+12 -6
View File
@@ -97,7 +97,8 @@ class PSBTOverviewScreen(ButtonListScreen):
max_inputs_text_width = 0
for input in inputs_column:
tw, th = font.getsize(input)
left, top, right, bottom = font.getbbox(input)
tw, th = right - left, bottom - top
max_inputs_text_width = max(tw, max_inputs_text_width)
# Given how wide we want our curves on each side to be...
@@ -148,7 +149,8 @@ class PSBTOverviewScreen(ButtonListScreen):
max_destination_text_width = 0
for destination in destination_column:
tw, th = font.getsize(destination)
left, top, right, bottom = font.getbbox(destination)
tw, th = right - left, bottom - top
max_destination_text_width = max(tw, max_destination_text_width)
return (max_destination_text_width, destination_column)
@@ -194,7 +196,8 @@ class PSBTOverviewScreen(ButtonListScreen):
input_curves = []
for input in inputs_column:
# Calculate right-justified input display
tw, th = font.getsize(input)
left, top, right, bottom = font.getbbox(input)
tw, th = right - left, bottom - top
cur_x = inputs_x + max_inputs_text_width - tw
draw.text(
(cur_x, inputs_y),
@@ -503,7 +506,8 @@ class PSBTMathScreen(ButtonListScreen):
body_font = Fonts.get_font(GUIConstants.BODY_FONT_NAME, (GUIConstants.BODY_FONT_SIZE)*ssf)
fixed_width_font = Fonts.get_font(GUIConstants.FIXED_WIDTH_FONT_NAME, (GUIConstants.BODY_FONT_SIZE + 6)*ssf)
digits_width, digits_height = fixed_width_font.getsize(self.input_amount + "+")
left, top, right, bottom = fixed_width_font.getbbox(self.input_amount + "+")
digits_width, digits_height = right - left, bottom - top
# Draw each line of the equation
cur_y = 0
@@ -520,8 +524,10 @@ class PSBTMathScreen(ButtonListScreen):
main_zone = display_str[:-6]
mid_zone = display_str[-6:-3]
end_zone = display_str[-3:]
main_zone_width, th = fixed_width_font.getsize(main_zone)
mid_zone_width, th = fixed_width_font.getsize(end_zone)
left, top, right, bottom = fixed_width_font.getbbox(main_zone)
main_zone_width, th = right - left, bottom - top
left, top, right, bottom = fixed_width_font.getbbox(end_zone)
mid_zone_width, th = right - left, bottom - top
draw.text((0, cur_y), text=main_zone, font=fixed_width_font, fill=GUIConstants.BODY_FONT_COLOR)
draw.text((main_zone_width + digit_group_spacing, cur_y), text=mid_zone, font=fixed_width_font, fill=secondary_digit_color)
draw.text((main_zone_width + digit_group_spacing + mid_zone_width + digit_group_spacing, cur_y), text=end_zone, font=fixed_width_font, fill=tertiary_digit_color)
src/seedsigner/gui/screens/seed_screens.py
+2 -1
View File
@@ -1043,7 +1043,8 @@ class SeedReviewPassphraseScreen(ButtonListScreen):
if found_solution:
break
font = Fonts.get_font(font_name=GUIConstants.FIXED_WIDTH_FONT_NAME, size=font_size)
char_width, char_height = font.getsize("X")
left, top, right, bottom = font.getbbox("X")
char_width, char_height = right - left, bottom - top
for num_lines in range(1, max_lines+1):
# Break the passphrase into n lines
chars_per_line = math.ceil(len(self.passphrase) / num_lines)