diff options
| author | Maxime Coste <frrrwww@gmail.com> | 2015-07-03 21:33:08 +0100 |
|---|---|---|
| committer | Maxime Coste <frrrwww@gmail.com> | 2015-07-03 21:33:08 +0100 |
| commit | 15a34be46dae7b9f82d3ce020fb7e2b75bc818e4 (patch) | |
| tree | 58297b967773ff0e1d91af9e21f65f97a259d5ed /src | |
| parent | 9e39aab325f7221a2c4a799f2d1de1d660c308f2 (diff) | |
| parent | 93b6534ef188dba78f642ec90bfed47ec82b8653 (diff) | |
Merge branch 'master' into colorscheme
Diffstat (limited to 'src')
| -rw-r--r-- | src/input_handler.cc | 2 | ||||
| -rw-r--r-- | src/ncurses_ui.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/input_handler.cc b/src/input_handler.cc index 5e11bfa6..30c14110 100644 --- a/src/input_handler.cc +++ b/src/input_handler.cc @@ -842,7 +842,7 @@ private: static void history_push(History& history, StringView entry) { - if(entry.empty()) + if(entry.empty() or is_horizontal_blank(entry[0_byte])) { return; } diff --git a/src/ncurses_ui.cc b/src/ncurses_ui.cc index 60f62a64..1fc1f0d4 100644 --- a/src/ncurses_ui.cc +++ b/src/ncurses_ui.cc @@ -482,7 +482,7 @@ Key NCursesUI::get_key() auto wheel_down_mask = NCURSES_MOUSE_MASK(m_wheel_down_button, NCURSES_BUTTON_PRESSED); auto wheel_up_mask = NCURSES_MOUSE_MASK(m_wheel_up_button, NCURSES_BUTTON_PRESSED); - CharCoord pos{ ev.y, ev.x }; + CharCoord pos{ ev.y - (m_status_on_top ? 1 : 0), ev.x }; if ((ev.bstate & BUTTON1_PRESSED) == BUTTON1_PRESSED) return mouse_press(pos); if ((ev.bstate & BUTTON1_RELEASED) == BUTTON1_RELEASED) return mouse_release(pos); if ((ev.bstate & wheel_down_mask) == wheel_down_mask) return mouse_wheel_down(pos); |