← Back to branch summary

~om26er/gallery-app/fix_selection_test

« back to all changes in this revision

Viewing changes to rc/qml/AlbumViewer/AlbumInternals/AlbumPageContents.qml

  • Committer: Bill Filler
  • Date: 2014-04-04 16:34:27 UTC
  • mfrom: (918.3.27 gallery-app-album-nav)
  • Revision ID: bill.filler@canonical.com-20140404163427-5yjg1t2tkv6ykou1
merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
rc/qml/AlbumViewer/AlbumInternals/AlbumPageContents.qml
114
114
    property real frameContentOffsetY: frameInsetMarginY
115
115
 
116
116
    // GU/pixel scale factor of preview frame
117
 
    property real scaleFactorX: width / (pixelWidth - pixelWidthOffset)
 
117
    property real scaleFactorX: ((isPreview) ? width : (width - gutterMargin)) / (pixelWidth - pixelWidthOffset)
118
118
    /*!
119
119
    */
120
 
    property real scaleFactorY: height / (pixelHeight - pixelHeightOffset)
 
120
    property real scaleFactorY: ((isPreview) ? height : (height - topMargin * 2 - bottomMargin)) / (pixelHeight - pixelHeightOffset)
121
121
 
122
122
    // Frame dimensions
123
123
    property real frameContentWidth: frame.contentWidth
281
281
 
282
282
        width: pixelWidth
283
283
        height: pixelHeight
 
284
        y: albumPageContents.isPreview ? 0 : topMargin
284
285
 
285
286
        xScale: scaleFactorX
286
287
        yScale: scaleFactorY
289
290
 
290
291
        album: albumPageContents.album
291
292
        isBack: !isRight
292
 
        isPreview: albumPageContents.isPreview
 
293
 
 
294
        // Always consider this as preview, so it matches the preview display when animating out
 
295
        // from the cover.
 
296
        isPreview: true
293
297
    }
294
298
}