TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-01-13 11:43:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Whoops, don't match selected_key inside draw_entry.

Browse Source
This commit is contained in:
Jared Boone 2015-12-05 20:25:05 -08:00
parent c4ad2ffe1b
commit 0f23736253
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
firmware/application/app_ais.cpp
View File

@ -424,7 +424,7 @@ bool AISView::on_encoder(const EncoderEvent event) {
return true;
}
bool AISView::draw_entry(
void AISView::draw_entry(
const RecentEntry& entry,
const Rect& target_rect,
Painter& painter,
@ -438,15 +438,7 @@ bool AISView::draw_entry(
}
line.resize(target_rect.width() / 8, ' ');
const bool is_selected_key = (selected_key == entry.mmsi);
if( has_focus && is_selected_key ) {
painter.draw_string(target_rect.pos, s.invert(), line);
} else {
painter.draw_string(target_rect.pos, s, line);
}
return is_selected_key;
painter.draw_string(target_rect.pos, s, line);
}
void AISView::paint(Painter& painter) {
@ -455,7 +447,9 @@ void AISView::paint(Painter& painter) {
Rect target_rect { r.pos, { r.width(), s.font.line_height() }};
for(const auto entry : recent) {
draw_entry(entry, target_rect, painter, s);
const auto is_selected_key = (selected_key == entry.mmsi);
const auto& draw_style = (has_focus && is_selected_key) ? s.invert() : s;
draw_entry(entry, target_rect, painter, draw_style);
target_rect.pos.y += target_rect.height();

2
firmware/application/app_ais.hpp
View File

@ -173,7 +173,7 @@ private:
void on_packet(const baseband::ais::Packet& packet);
bool draw_entry(
void draw_entry(
const RecentEntry& entry,
const Rect& target_rect,
Painter& painter,