Merge branch 'v1.2' into add-heading-to-geomap

This commit is contained in:
Erwin Ried
2020-08-15 15:52:53 +02:00
committed by GitHub
19 changed files with 2499 additions and 2119 deletions
+9
View File
@@ -95,6 +95,15 @@ void BtnGridView::set_parent_rect(const Rect new_parent_rect) {
update_items();
}
void BtnGridView::set_arrow_enabled(bool new_value) {
if(new_value){
add_child(&arrow_more);
}
else{
remove_child(&arrow_more);
}
};
void BtnGridView::on_tick_second() {
if (more && blink)
arrow_more.set_foreground(Color::white());
+1
View File
@@ -62,6 +62,7 @@ public:
uint32_t highlighted_index();
void set_parent_rect(const Rect new_parent_rect) override;
void set_arrow_enabled(bool new_value);
void on_focus() override;
void on_blur() override;
bool on_key(const KeyEvent event) override;
+2 -2
View File
@@ -120,8 +120,8 @@ void FrequencyScale::paint(Painter& painter) {
if (_blink) {
const Rect r_cursor {
120 + cursor_position, r.bottom() - filter_band_height,
2, filter_band_height
118 + cursor_position, r.bottom() - filter_band_height,
5, filter_band_height
};
painter.fill_rectangle(
r_cursor,