← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

[Merge] lp:~verzegnassi-stefano/ubuntu-docviewer-app/frieza-lok-zoom-selector into lp:ubuntu-docviewer-app

 

Stefano Verzegnassi has proposed merging lp:~verzegnassi-stefano/ubuntu-docviewer-app/frieza-lok-zoom-selector into lp:ubuntu-docviewer-app.

Commit message:
[lok-viewer] Fixed ZoomSelector visibility on frieza (BQ M10)

Requested reviews:
  Ubuntu Document Viewer Developers (ubuntu-docviewer-dev)
Related bugs:
  Bug #1551254 in Ubuntu Document Viewer App: "[loviewer] ZoomSelector not visible on frieza"
  https://bugs.launchpad.net/ubuntu-docviewer-app/+bug/1551254

For more details, see:
https://code.launchpad.net/~verzegnassi-stefano/ubuntu-docviewer-app/frieza-lok-zoom-selector/+merge/287474

http://bazaar.launchpad.net/~ubuntu-docviewer-dev/ubuntu-docviewer-app/lo-viewer/view/head:/src/app/qml/ubuntu-docviewer-app.qml

We detect the screen/window size through three properties:
- narrowWindow
- wideWindow
- veryWideWindow

Zoom selector is visible when mainView.wideWindow is true.

But, before the last release, I changed the condition to:
    (width >= units.gu(80) && width < units.gu(120))

I forgot that in the code we consider "veryWideWindow" as a particular case of "wideWindow", so there's no need for limiting the latter to units.gu(120).
-- 
Your team Ubuntu Document Viewer Developers is requested to review the proposed merge of lp:~verzegnassi-stefano/ubuntu-docviewer-app/frieza-lok-zoom-selector into lp:ubuntu-docviewer-app.
=== modified file 'src/app/qml/ubuntu-docviewer-app.qml'
--- src/app/qml/ubuntu-docviewer-app.qml	2016-02-07 23:01:57 +0000
+++ src/app/qml/ubuntu-docviewer-app.qml	2016-02-29 14:37:13 +0000
@@ -40,7 +40,7 @@
     readonly property bool desktopMode: DocumentViewer.desktopMode
 
     readonly property bool narrowWindow: width < units.gu(51)
-    readonly property bool wideWindow: width >= units.gu(80) && width < units.gu(120)
+    readonly property bool wideWindow: width >= units.gu(80)
     readonly property bool veryWideWindow: width >= units.gu(120)
     readonly property bool isLandscape: Screen.orientation == Qt.LandscapeOrientation ||
                                         Screen.orientation == Qt.InvertedLandscapeOrientation


Follow ups