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 #757 from kdmukai/calc_final_word_screen_l10n_spacing_fix

Browse Source 
[l10n] `ToolsCalcFinalWordScreen`: adjusts spacing for locales w/larger fonts
This commit is contained in:
Nick Klockenga
2025-06-21 21:38:41 -04:00
committed by GitHub
parent 5c89d7dcfb eeef7ce92d
commit bd4b2a8fb9
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/seedsigner/gui/screens/tools_screens.py
+10 -5
View File
@@ -267,13 +267,17 @@ class ToolsCalcFinalWordScreen(ButtonListScreen):
super().__post_init__() super().__post_init__()
# First what's the total bit display width and where do the checksum bits start? # First what's the total bit display width and where do the checksum bits start?
bit_font_size = GUIConstants.get_button_font_size() + 2 bit_font_size = GUIConstants.get_button_font_size(locale="default") + 2 # bit font size should not vary by locale
font = Fonts.get_font(GUIConstants.FIXED_WIDTH_EMPHASIS_FONT_NAME, bit_font_size) font = Fonts.get_font(GUIConstants.FIXED_WIDTH_EMPHASIS_FONT_NAME, bit_font_size)
(left, top, bit_display_width, bit_font_height) = font.getbbox("0" * 11, anchor="lt") (left, top, bit_display_width, bit_font_height) = font.getbbox("0" * 11, anchor="lt")
(left, top, checksum_x, bottom) = font.getbbox("0" * (11 - len(self.checksum_bits)), anchor="lt") (left, top, checksum_x, bottom) = font.getbbox("0" * (11 - len(self.checksum_bits)), anchor="lt")
bit_display_x = int((self.canvas_width - bit_display_width)/2) bit_display_x = int((self.canvas_width - bit_display_width)/2)
checksum_x += bit_display_x checksum_x += bit_display_x
y_spacer = GUIConstants.COMPONENT_PADDING
if GUIConstants.get_body_font_size() > GUIConstants.get_body_font_size("default"):
y_spacer -= 1
# Display the user's additional entropy input # Display the user's additional entropy input
if self.selected_final_word: if self.selected_final_word:
selection_text = self.selected_final_word selection_text = self.selected_final_word
@@ -300,7 +304,7 @@ class ToolsCalcFinalWordScreen(ButtonListScreen):
)) ))
# ...and that entropy's associated 11 bits # ...and that entropy's associated 11 bits
screen_y = self.components[-1].screen_y + self.components[-1].height + GUIConstants.COMPONENT_PADDING screen_y = self.components[-1].screen_y + self.components[-1].height + y_spacer
first_bits_line = TextArea( first_bits_line = TextArea(
text=keeper_selected_bits, text=keeper_selected_bits,
font_name=GUIConstants.FIXED_WIDTH_EMPHASIS_FONT_NAME, font_name=GUIConstants.FIXED_WIDTH_EMPHASIS_FONT_NAME,
@@ -327,18 +331,19 @@ class ToolsCalcFinalWordScreen(ButtonListScreen):
is_text_centered=False, is_text_centered=False,
)) ))
# Show the checksum.. # Show the checksum...
self.components.append(TextArea( self.components.append(TextArea(
# TRANSLATOR_NOTE: A function of "x" to be used for detecting errors in "x" # TRANSLATOR_NOTE: A function of "x" to be used for detecting errors in "x"
text=_("Checksum"), text=_("Checksum"),
edge_padding=0, edge_padding=0,
screen_y=first_bits_line.screen_y + first_bits_line.height + 2*GUIConstants.COMPONENT_PADDING, screen_y=first_bits_line.screen_y + first_bits_line.height + 2*GUIConstants.COMPONENT_PADDING,
height_ignores_below_baseline=True, # Keep the next line (bits display) snugged up, regardless of text rendering below the baseline
)) ))
# ...and its actual bits. Prepend spacers to keep vertical alignment # ...and its actual bits. Prepend spacers to keep vertical alignment
checksum_spacer = "_" * (11 - len(self.checksum_bits)) checksum_spacer = "_" * (11 - len(self.checksum_bits))
screen_y = self.components[-1].screen_y + self.components[-1].height + GUIConstants.COMPONENT_PADDING screen_y = self.components[-1].screen_y + self.components[-1].height + y_spacer
# This time we de-emphasize the prepended spacers that are irrelevant # This time we de-emphasize the prepended spacers that are irrelevant
self.components.append(TextArea( self.components.append(TextArea(
@@ -375,7 +380,7 @@ class ToolsCalcFinalWordScreen(ButtonListScreen):
# Once again show the bits that came from the user's entropy... # Once again show the bits that came from the user's entropy...
num_checksum_bits = len(self.checksum_bits) num_checksum_bits = len(self.checksum_bits)
user_component = self.selected_final_bits[:11 - num_checksum_bits] user_component = self.selected_final_bits[:11 - num_checksum_bits]
screen_y = self.components[-1].screen_y + self.components[-1].height + GUIConstants.COMPONENT_PADDING screen_y = self.components[-1].screen_y + self.components[-1].height + y_spacer
self.components.append(TextArea( self.components.append(TextArea(
text=user_component, text=user_component,
font_name=GUIConstants.FIXED_WIDTH_EMPHASIS_FONT_NAME, font_name=GUIConstants.FIXED_WIDTH_EMPHASIS_FONT_NAME,