Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix drawing of 1pix bar shape #4704

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix drawing of 1pix bar shape #4704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9de1c43
fix(core): fix t3w1 revA prodtest build
cepetr Mar 3, 2025
54fe592
fix(rust): fix drawing of 1px bar shape
cepetr Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions core/embed/rust/src/ui/shape/bar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,22 @@ impl Shape<'_> for Bar {

// TODO: fatal_error! in unsupported scenarious

let th = match self.fg_color {
Some(_) => self.thickness,
None => 0,
let (fg_color, bg_color, th) = if self.fg_color.is_some() {
let th = self.thickness;
if th * 2 < self.area.width() && th * 2 < self.area.height() {
// Draw a rectangle with a border
(self.fg_color, self.bg_color, th)
} else {
// Too thick border => draw a filled rectangle
(None, self.fg_color, 0)
}
} else {
// No foreground color => draw a filled rectangle
(None, self.bg_color, 0)
};

if self.radius == 0 {
if let Some(fg_color) = self.fg_color {
if let Some(fg_color) = fg_color {
// outline
if th > 0 {
let r = self.area;
Expand Down Expand Up @@ -129,13 +138,13 @@ impl Shape<'_> for Bar {
);
}
}
if let Some(bg_color) = self.bg_color {
if let Some(bg_color) = bg_color {
// background
let bg_r = self.area.shrink(th);
canvas.fill_rect(bg_r, bg_color, self.alpha);
}
} else {
if let Some(fg_color) = self.fg_color {
if let Some(fg_color) = fg_color {
if th > 0 {
if self.bg_color.is_some() {
canvas.fill_round_rect(self.area, self.radius, fg_color, self.alpha);
Expand All @@ -145,7 +154,7 @@ impl Shape<'_> for Bar {
}
}
}
if let Some(bg_color) = self.bg_color {
if let Some(bg_color) = bg_color {
let bg_r = self.area.shrink(th);
canvas.fill_round_rect(bg_r, self.radius, bg_color, self.alpha);
}
Expand Down
2 changes: 1 addition & 1 deletion core/site_scons/models/T3W1/trezor_t3w1_revA.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ def configure(
features_available.append("ble")
defines += [("USE_BLE", "1")]
sources += ["embed/io/nrf/stm32u5/nrf.c"]
sources += ["embed/io/nrf/stm32u5/nrf_test.c"]
sources += ["embed/io/nrf/crc8.c"]
paths += ["embed/io/nrf/inc"]
sources += [
Expand Down Expand Up @@ -118,7 +119,6 @@ def configure(
paths += ["embed/io/nfc/rfal/source"]
paths += ["embed/io/nfc/rfal/source/st25r3916"]
paths += ["embed/io/nfc/rfal/include/"]
features_available.append("nfc")
defines += [("USE_NFC", "1")]

if "optiga" in features_wanted:
Expand Down