← Back to branch summary

~adamreichold/qpdfview/trunk

« back to all changes in this revision

Viewing changes to sources/documentview.cpp

  • Committer: Adam Reichold
  • Date: 2015-05-20 18:12:54 UTC
  • mto: This revision was merged to the branch mainline in revision 1914.
  • Revision ID: adam.reichold@t-online.de-20150520181254-na9t774k9113zqdd
Add a setting to trigger the background composition.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sources/documentview.cpp
248
248
    return index.data(SearchModel::RectRole).toRectF();
249
249
}
250
250
 
 
251
inline void adjustComposeBackgroundMode(RenderParam& renderParam, ComposeBackgroundMode mode)
 
252
{
 
253
    switch(mode)
 
254
    {
 
255
    default:
 
256
        break;
 
257
    case DarkenBackgroundMode:
 
258
        renderParam.setDarkenBackground(true);
 
259
        break;
 
260
    case LightenBackgroundMode:
 
261
        renderParam.setLightenBackground(true);
 
262
        break;
 
263
    }
 
264
}
 
265
 
251
266
inline void adjustScaleFactor(RenderParam& renderParam, qreal scaleFactor)
252
267
{
253
268
    if(!qFuzzyCompare(renderParam.scaleFactor(), scaleFactor))
732
747
{
733
748
    switch(renderFlag)
734
749
    {
 
750
    default:
 
751
        break;
735
752
    case InvertColors:
736
753
        setInvertColors(enabled);
737
754
        break;
2365
2382
{
2366
2383
    // prepare render parameters and adjust scale factor
2367
2384
 
 
2385
    RenderParam renderParam(logicalDpiX(), logicalDpiY(), 1.0,
 
2386
                            scaleFactor(), rotation(), renderFlags());
 
2387
 
2368
2388
#if QT_VERSION >= QT_VERSION_CHECK(5,1,0)
2369
2389
 
2370
 
    RenderParam renderParam(logicalDpiX(), logicalDpiY(), devicePixelRatio(),
2371
 
                            scaleFactor(), rotation(), renderFlags());
2372
 
 
2373
 
#else
2374
 
 
2375
 
    RenderParam renderParam(logicalDpiX(), logicalDpiY(), 1.0,
2376
 
                            scaleFactor(), rotation(), renderFlags());
 
2390
    renderParam.setDevicePixelRatio(devicePixelRatio());
2377
2391
 
2378
2392
#endif // QT_VERSION
2379
2393
 
 
2394
    adjustComposeBackgroundMode(renderParam, s_settings->documentView().composeBackground());
 
2395
 
2380
2396
    const qreal visibleWidth = m_layout->visibleWidth(viewport()->width());
2381
2397
    const qreal visibleHeight = m_layout->visibleHeight(viewport()->height());
2382
2398
 
2490
2506
{
2491
2507
    // prepare render parameters and adjust scale factor
2492
2508
 
 
2509
    RenderParam renderParam(logicalDpiX(), logicalDpiY(), 1.0,
 
2510
                            scaleFactor(), rotation(), renderFlags());
 
2511
 
2493
2512
#if QT_VERSION >= QT_VERSION_CHECK(5,1,0)
2494
2513
 
2495
 
    RenderParam renderParam(logicalDpiX(), logicalDpiY(), devicePixelRatio(),
2496
 
                            scaleFactor(), rotation(), renderFlags());
2497
 
 
2498
 
#else
2499
 
 
2500
 
    RenderParam renderParam(logicalDpiX(), logicalDpiY(), 1.0,
2501
 
                            scaleFactor(), rotation(), renderFlags());
 
2514
    renderParam.setDevicePixelRatio(devicePixelRatio());
2502
2515
 
2503
2516
#endif // QT_VERSION
2504
2517
 
 
2518
    adjustComposeBackgroundMode(renderParam, s_settings->documentView().composeBackground());
 
2519
 
2505
2520
    const qreal thumbnailSize = s_settings->documentView().thumbnailSize();
2506
2521
 
2507
2522
    foreach(ThumbnailItem* page, m_thumbnailItems)