1e13602 · unity8 · git.iko.soy

src/ApplicationArguments.h+2−2

@@ -29,8 +29,8 @@ class ApplicationArguments : public QObject

29 Q_OBJECT

30public:

31 ApplicationArguments(const QStringList& args) {

32− if (args.contains(QLatin1String("-geometry")) && args.size() > args.indexOf(QLatin1String("-geometry")) + 1) {

32+ if (args.contains(QLatin1String("-windowgeometry")) && args.size() > args.indexOf(QLatin1String("-windowgeometry")) + 1) {

33− QStringList geometryArg = args.at(args.indexOf(QLatin1String("-geometry")) + 1).split('x');

33+ QStringList geometryArg = args.at(args.indexOf(QLatin1String("-windowgeometry")) + 1).split('x');

34 if (geometryArg.size() == 2) {

35 m_size.rwidth() = geometryArg.at(0).toInt();

36 m_size.rheight() = geometryArg.at(1).toInt();

src/Panel/Indicators/client/indicatorsclient.cpp+2−2

@@ -49,8 +49,8 @@ IndicatorsClient::IndicatorsClient(int &argc, char **argv)

49

50 m_view->setSource(QUrl("IndicatorsClient.qml"));

51 m_view->setResizeMode(QQuickView::SizeRootObjectToView);

52− if (args.contains(QLatin1String("-geometry")) && args.size() > args.indexOf(QLatin1String("-geometry")) + 1) {

52+ if (args.contains(QLatin1String("-windowgeometry")) && args.size() > args.indexOf(QLatin1String("-windowgeometry")) + 1) {

53− QStringList geometryArg = args.at(args.indexOf(QLatin1String("-geometry")) + 1).split('x');

53+ QStringList geometryArg = args.at(args.indexOf(QLatin1String("-windowgeometry")) + 1).split('x');

54 if (geometryArg.size() == 2) {

55 m_view->resize(geometryArg.at(0).toInt(), geometryArg.at(1).toInt());

56 }

tests/autopilot/unity8/shell/tests/__init__.py+1−1

@@ -181,7 +181,7 @@ class UnityTestCase(AutopilotTestCase):

181 )

182 geo_string = "%dx%d" % (width, height)

183 self.unity_geometry_args = [

184− '-geometry',

184+ '-windowgeometry',

185 geo_string,

186 '-frameless',

187 '-mousetouch'