-
-
Notifications
You must be signed in to change notification settings - Fork 677
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor(core): feature-gate non-bootloader fonts
- a crutch to preserve code which depends on specific fonts - see #4574 [no changelog]
- Loading branch information
Showing
3 changed files
with
47 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,24 @@ | ||
#[cfg(not(feature = "bootloader"))] | ||
mod font_robotomono_medium_20; | ||
mod font_tthoves_bold_17; | ||
#[cfg(not(feature = "bootloader"))] | ||
mod font_tthoves_demibold_21; | ||
mod font_tthoves_regular_21; | ||
|
||
#[cfg(not(feature = "bootloader"))] | ||
use font_robotomono_medium_20::Font_RobotoMono_Medium_20_info; | ||
use font_tthoves_bold_17::Font_TTHoves_Bold_17_upper_info; | ||
#[cfg(not(feature = "bootloader"))] | ||
use font_tthoves_demibold_21::Font_TTHoves_DemiBold_21_info; | ||
use font_tthoves_regular_21::Font_TTHoves_Regular_21_info; | ||
|
||
pub const FONT_NORMAL: crate::ui::display::Font = &Font_TTHoves_Regular_21_info; | ||
pub const FONT_BOLD_UPPER: crate::ui::display::Font = &Font_TTHoves_Bold_17_upper_info; | ||
#[cfg(feature = "bootloader")] | ||
pub const FONT_DEMIBOLD: crate::ui::display::Font = FONT_NORMAL; | ||
#[cfg(not(feature = "bootloader"))] | ||
pub const FONT_DEMIBOLD: crate::ui::display::Font = &Font_TTHoves_DemiBold_21_info; | ||
#[cfg(feature = "bootloader")] | ||
pub const FONT_MONO: crate::ui::display::Font = FONT_NORMAL; | ||
#[cfg(not(feature = "bootloader"))] | ||
pub const FONT_MONO: crate::ui::display::Font = &Font_RobotoMono_Medium_20_info; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,41 @@ | ||
mod font_pixeloperator_bold_8; | ||
mod font_pixeloperator_regular_8; | ||
#[cfg(not(feature = "bootloader"))] | ||
mod font_pixeloperatormono_regular_8; | ||
#[cfg(not(feature = "bootloader"))] | ||
mod font_unifont_bold_16; | ||
#[cfg(not(feature = "bootloader"))] | ||
mod font_unifont_regular_16; | ||
|
||
use font_pixeloperator_bold_8::{ | ||
Font_PixelOperator_Bold_8_info, Font_PixelOperator_Bold_8_upper_info, | ||
}; | ||
use font_pixeloperator_bold_8::Font_PixelOperator_Bold_8_info; | ||
#[cfg(not(feature = "bootloader"))] | ||
use font_pixeloperator_bold_8::Font_PixelOperator_Bold_8_upper_info; | ||
use font_pixeloperator_regular_8::{ | ||
Font_PixelOperator_Regular_8_info, Font_PixelOperator_Regular_8_upper_info, | ||
}; | ||
#[cfg(not(feature = "bootloader"))] | ||
use font_pixeloperatormono_regular_8::Font_PixelOperatorMono_Regular_8_info; | ||
#[cfg(not(feature = "bootloader"))] | ||
use font_unifont_bold_16::Font_Unifont_Bold_16_info; | ||
#[cfg(not(feature = "bootloader"))] | ||
use font_unifont_regular_16::Font_Unifont_Regular_16_info; | ||
|
||
pub const FONT_NORMAL: crate::ui::display::Font = &Font_PixelOperator_Regular_8_info; | ||
pub const FONT_BOLD: crate::ui::display::Font = &Font_PixelOperator_Bold_8_info; | ||
pub const FONT_NORMAL_UPPER: crate::ui::display::Font = &Font_PixelOperator_Regular_8_upper_info; | ||
#[cfg(feature = "bootloader")] | ||
pub const FONT_DEMIBOLD: crate::ui::display::Font = FONT_NORMAL; | ||
#[cfg(not(feature = "bootloader"))] | ||
pub const FONT_DEMIBOLD: crate::ui::display::Font = &Font_Unifont_Bold_16_info; | ||
#[cfg(feature = "bootloader")] | ||
pub const FONT_MONO: crate::ui::display::Font = FONT_NORMAL; | ||
#[cfg(not(feature = "bootloader"))] | ||
pub const FONT_MONO: crate::ui::display::Font = &Font_PixelOperatorMono_Regular_8_info; | ||
#[cfg(feature = "bootloader")] | ||
pub const FONT_BIG: crate::ui::display::Font = FONT_NORMAL; | ||
#[cfg(not(feature = "bootloader"))] | ||
pub const FONT_BIG: crate::ui::display::Font = &Font_Unifont_Regular_16_info; | ||
pub const FONT_NORMAL_UPPER: crate::ui::display::Font = &Font_PixelOperator_Regular_8_upper_info; | ||
#[cfg(feature = "bootloader")] | ||
pub const FONT_BOLD_UPPER: crate::ui::display::Font = FONT_NORMAL_UPPER; | ||
#[cfg(not(feature = "bootloader"))] | ||
pub const FONT_BOLD_UPPER: crate::ui::display::Font = &Font_PixelOperator_Bold_8_upper_info; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,29 @@ | ||
#[cfg(not(feature = "bootloader"))] | ||
mod font_robotomono_medium_21; | ||
#[cfg(not(feature = "bootloader"))] | ||
mod font_ttsatoshi_demibold_18; | ||
mod font_ttsatoshi_demibold_21; | ||
#[cfg(not(feature = "bootloader"))] | ||
mod font_ttsatoshi_demibold_42; | ||
|
||
#[cfg(not(feature = "bootloader"))] | ||
use font_robotomono_medium_21::Font_RobotoMono_Medium_21_info; | ||
#[cfg(not(feature = "bootloader"))] | ||
use font_ttsatoshi_demibold_18::Font_TTSatoshi_DemiBold_18_info; | ||
use font_ttsatoshi_demibold_21::Font_TTSatoshi_DemiBold_21_info; | ||
#[cfg(not(feature = "bootloader"))] | ||
use font_ttsatoshi_demibold_42::Font_TTSatoshi_DemiBold_42_info; | ||
|
||
pub const FONT_DEMIBOLD: crate::ui::display::Font = &Font_TTSatoshi_DemiBold_21_info; | ||
#[cfg(feature = "bootloader")] | ||
pub const FONT_MONO: crate::ui::display::Font = FONT_DEMIBOLD; | ||
#[cfg(not(feature = "bootloader"))] | ||
pub const FONT_MONO: crate::ui::display::Font = &Font_RobotoMono_Medium_21_info; | ||
#[cfg(feature = "bootloader")] | ||
pub const FONT_BIG: crate::ui::display::Font = FONT_DEMIBOLD; | ||
#[cfg(not(feature = "bootloader"))] | ||
pub const FONT_BIG: crate::ui::display::Font = &Font_TTSatoshi_DemiBold_42_info; | ||
#[cfg(feature = "bootloader")] | ||
pub const FONT_SUB: crate::ui::display::Font = FONT_DEMIBOLD; | ||
#[cfg(not(feature = "bootloader"))] | ||
pub const FONT_SUB: crate::ui::display::Font = &Font_TTSatoshi_DemiBold_18_info; |