comparison view/ViewManager.h @ 900:1fc4f29feb2e cxx11

Merge from default branch
author Chris Cannam
date Tue, 03 Mar 2015 09:33:59 +0000
parents 78e041e45ff0
children a1226b3b7925
comparison
equal deleted inserted replaced
898:2be9753651c8 900:1fc4f29feb2e
182 */ 182 */
183 int getMainModelSampleRate() const { return m_mainModelSampleRate; } 183 int getMainModelSampleRate() const { return m_mainModelSampleRate; }
184 184
185 void setMainModelSampleRate(int sr) { m_mainModelSampleRate = sr; } 185 void setMainModelSampleRate(int sr) { m_mainModelSampleRate = sr; }
186 186
187 /**
188 * Take a "design pixel" size and scale it for the actual
189 * display. This is relevant to hi-dpi systems that do not do
190 * pixel doubling (i.e. Windows and Linux rather than OS/X).
191 */
192 int scalePixelSize(int pixels);
193
187 enum OverlayMode { 194 enum OverlayMode {
188 NoOverlays, 195 NoOverlays,
189 GlobalOverlays, 196 GlobalOverlays,
190 StandardOverlays, 197 StandardOverlays,
191 AllOverlays 198 AllOverlays