minor fixes

marioguerriero · Sep 14, 2013 · eb0152b · eb0152b
1 parent 1a01a68
commit eb0152b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/qml/components/Camera.qml b/qml/components/Camera.qml
@@ -18,6 +18,7 @@
 **/
 
 import QtQuick 2.0
+import QtQuick.Window 2.0
 import Ubuntu.Components 0.1
 import QtMultimedia 5.0
 
@@ -45,7 +46,8 @@ UbuntuShape {
            FIXME: This should come from a system configuration option so that we
            don't have to have a different codebase for each different device we want
            to run on */
-        //orientation: device.naturalOrientation === "portrait"  ? -90 : 0
+         //orientation: device.naturalOrientation === "portrait"  ? -90 : 0
+          orientation: Screen.primaryOrientation == Qt.LandscapeOrientation ? 0 : -90
     }
 
     property alias imagePath: camera.imagePath

diff --git a/qml/components/FilterSidebar.qml b/qml/components/FilterSidebar.qml
@@ -110,6 +110,7 @@ Sidebar {
     }
     Scrollbar {
         flickableItem: listView
+        align: Qt.AlignTrailing
     }
 
     property var tagsList: [] // Used to get counts

diff --git a/qml/components/GridLayout.qml b/qml/components/GridLayout.qml
@@ -33,11 +33,11 @@ Flickable {
     clip: true
 
     height: memoryGrid.height
+    contentHeight: memoryGrid.columns == 1 ? height : height + units.gu(10)
 
     flickableDirection: Flickable.VerticalFlick
 
     // Component properties
-    //property var memories: [ ]
     property int itemSize: wideAspect ? units.gu(18.5) : units.gu(12.5)
 
     property int currentIndex: 0