macOS alignment fixes (#2045).

[dcpomatic.git] / src / wx / audio_mapping_view.h

diff --git a/src/wx/audio_mapping_view.h b/src/wx/audio_mapping_view.h
index f5626e524d66020e44c544a65f1570cba888f404..aad152a622172be69fb25d9f82adc9e542ad468e 100644 (file)
--- a/src/wx/audio_mapping_view.h
+++ b/src/wx/audio_mapping_view.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,11 +18,13 @@
 
 */
 
+
 /** @file  src/wx/audio_mapping_view.h
  *  @brief AudioMappingView class.
  *
  */
 
+
 #include "lib/audio_mapping.h"
 #include "lib/types.h"
 #include "lib/warnings.h"
@@ -31,6 +33,7 @@ DCPOMATIC_DISABLE_WARNINGS
 DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
+
 /** @class AudioMappingView
  *  @brief This class displays the mapping of one set of audio channels to another,
  *  with gain values on each node of the map.
@@ -45,7 +48,6 @@ DCPOMATIC_ENABLE_WARNINGS
  *  hidden from view.  Thus input channels are never hidden but output channels
  *  might be.
  */
-
 class AudioMappingView : public wxPanel
 {
 public:
@@ -77,7 +79,6 @@ public:
 
 private:
        void map_values_changed ();
-       void setup_sizes ();
        void paint ();
        void paint_static (wxDC& dc);
        void paint_column_labels (wxDC& dc);
@@ -91,7 +92,7 @@ private:
        void right_down (wxMouseEvent &);
        void motion (wxMouseEvent &);
        void mouse_wheel (wxMouseEvent &);
-       boost::optional<std::pair<NamedChannel, NamedChannel> > mouse_event_to_channels (wxMouseEvent& ev) const;
+       boost::optional<std::pair<NamedChannel, NamedChannel>> mouse_event_to_channels (wxMouseEvent& ev) const;
        boost::optional<std::string> mouse_event_to_input_group_name (wxMouseEvent& ev) const;
        void setup ();
        wxString input_channel_name_with_group (NamedChannel const& n) const;
@@ -101,10 +102,10 @@ private:
 
        AudioMapping _map;
 
-       wxMenu* _menu;
-       wxPanel* _body;
-       wxScrollBar* _vertical_scroll;
-       wxScrollBar* _horizontal_scroll;
+       wxMenu* _menu = nullptr;
+       wxPanel* _body = nullptr;
+       wxScrollBar* _vertical_scroll = nullptr;
+       wxScrollBar* _horizontal_scroll = nullptr;
        int _menu_input;
        int _menu_output;
 
@@ -116,6 +117,8 @@ private:
        std::vector<NamedChannel> _input_channels;
        std::vector<NamedChannel> _output_channels;
        std::vector<Group> _input_groups;
+       std::vector<int> _column_widths;
+       int _column_widths_total = 0;
 
-       boost::optional<std::pair<NamedChannel, NamedChannel> > _last_tooltip_channels;
+       boost::optional<std::pair<NamedChannel, NamedChannel>> _last_tooltip_channels;
 };