@@ -63,11 +63,9 @@ AbstractButton {
63 horizontalCenter: parent.horizontalCenter
63 horizontalCenter: parent.horizontalCenter
66− // FIXME: width and height should be defined according to the
67− // application window's aspect ratio.
68− width: (application.stage === ApplicationInfo.MainStage && __sideStageEnabled) ?
69− units.gu(22) : units.gu(11)
70 height: (__sideStageEnabled) ? units.gu(22) : units.gu(19)
66 height: (__sideStageEnabled) ? units.gu(22) : units.gu(19)
67+ width: applicationImage.width
71 radius: "medium"
69 radius: "medium"
72 image: applicationImage
70 image: applicationImage
@@ -75,8 +73,8 @@ AbstractButton {
75 ApplicationImage {
73 ApplicationImage {
76 id: applicationImage
74 id: applicationImage
77 source: ApplicationManager.findApplication((application) ? application.appId : "")
75 source: ApplicationManager.findApplication((application) ? application.appId : "")
78− width: shapedApplicationImage.width
79 height: shapedApplicationImage.height
76 height: shapedApplicationImage.height
77+ width: Math.min(height, height * sourceSize.width / sourceSize.height)
82 UbuntuShape {
80 UbuntuShape {