diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-04-27 22:11:50 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-04-28 01:06:11 +0000 |
| commit | 4540ff0beb2dad9911afc309b75952adc226fa48 (patch) | |
| tree | 703e2041ae35ca3fe1778431db8483d70bf2b235 /src/wx/audio_mapping_view.h | |
| parent | 68e1ce3ac94ee0b0313d612c21cddc007f3b4e7a (diff) | |
Fix AudioMappingView scrolling so that only the body of the grid is scrolled.v2.13.154
Diffstat (limited to 'src/wx/audio_mapping_view.h')
| -rw-r--r-- | src/wx/audio_mapping_view.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/wx/audio_mapping_view.h b/src/wx/audio_mapping_view.h index c1d8ba387..527510c77 100644 --- a/src/wx/audio_mapping_view.h +++ b/src/wx/audio_mapping_view.h @@ -24,7 +24,7 @@ */ #include <boost/signals2.hpp> -#include <wx/scrolwin.h> +#include <wx/wx.h> #include "lib/audio_mapping.h" /** @class AudioMappingView @@ -42,7 +42,7 @@ * might be. */ -class AudioMappingView : public wxScrolledWindow +class AudioMappingView : public wxPanel { public: explicit AudioMappingView (wxWindow *); @@ -75,11 +75,20 @@ private: void map_values_changed (); void setup_sizes (); void paint (); + void paint_static (wxDC& dc, wxGraphicsContext* gc); + void paint_column_labels (wxDC& dc, wxGraphicsContext* gc); + void paint_column_lines (wxGraphicsContext* gc); + void paint_row_labels (wxDC& dc, wxGraphicsContext* gc); + void paint_row_lines (wxGraphicsContext* gc); + void paint_indicators (wxDC& dc); + void size (wxSizeEvent &); + void scroll (); void left_down (wxMouseEvent &); void right_down (wxMouseEvent &); void motion (wxMouseEvent &); + void mouse_wheel (wxMouseEvent &); boost::optional<std::pair<int, int> > mouse_event_to_channels (wxMouseEvent& ev) const; - void set_virtual_size (); + void setup (); void off (); void full (); @@ -89,6 +98,9 @@ private: AudioMapping _map; wxMenu* _menu; + wxPanel* _body; + wxScrollBar* _vertical_scroll; + wxScrollBar* _horizontal_scroll; int _menu_input; int _menu_output; |