Mercurial > hg > svapp
comparison framework/MainWindowBase.cpp @ 434:dee4aceb131c cxx11
Fixes to go with latest svcore
| author | Chris Cannam |
|---|---|
| date | Wed, 04 Mar 2015 13:53:13 +0000 |
| parents | 9876a1db566c |
| children | 618d5816b04d |
comparison
equal
deleted
inserted
replaced
| 433:720f732e8082 | 434:dee4aceb131c |
|---|---|
| 2368 if (!currentPane) return; | 2368 if (!currentPane) return; |
| 2369 | 2369 |
| 2370 Model *model = getMainModel(); | 2370 Model *model = getMainModel(); |
| 2371 if (!model) return; | 2371 if (!model) return; |
| 2372 | 2372 |
| 2373 int start = model->getStartFrame(); | 2373 sv_frame_t start = model->getStartFrame(); |
| 2374 int end = model->getEndFrame(); | 2374 sv_frame_t end = model->getEndFrame(); |
| 2375 if (m_playSource) end = std::max(end, m_playSource->getPlayEndFrame()); | 2375 if (m_playSource) end = std::max(end, m_playSource->getPlayEndFrame()); |
| 2376 int pixels = currentPane->width(); | 2376 int pixels = currentPane->width(); |
| 2377 | 2377 |
| 2378 int sw = currentPane->getVerticalScaleWidth(); | 2378 int sw = currentPane->getVerticalScaleWidth(); |
| 2379 if (pixels > sw * 2) pixels -= sw * 2; | 2379 if (pixels > sw * 2) pixels -= sw * 2; |