Merge branch 'master' of github.com:musescore/MuseScore

musescore · Jan 8, 2015 · 68600ec · 68600ec
2 parents 328503f + 7e004c8
commit 68600ec
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/mscore/exampleview.cpp b/mscore/exampleview.cpp
@@ -331,5 +331,15 @@ void ExampleView::mousePressEvent(QMouseEvent* event)
             }
       }
 
+//---------------------------------------------------------
+//   sizeHint
+//---------------------------------------------------------
+
+QSize ExampleView::sizeHint() const
+      {
+      return QSize(1000 * guiScaling, 80 * guiScaling);
+      }
+
+
 }
 
diff --git a/mscore/exampleview.h b/mscore/exampleview.h
@@ -46,8 +46,8 @@ class ExampleView : public QFrame, public MuseScoreView {
       virtual void dragLeaveEvent(QDragLeaveEvent*);
       virtual void dragMoveEvent(QDragMoveEvent*);
       virtual void dropEvent(QDropEvent*);
-      virtual QSize sizeHint() const { return QSize(1000, 80); }
       virtual void mousePressEvent(QMouseEvent*);
+      virtual QSize sizeHint() const;
 
    signals:
       void noteClicked(Note*);

diff --git a/mscore/startcenter.cpp b/mscore/startcenter.cpp
@@ -291,7 +291,7 @@ void MyWebView::addToJavascript()
 
 QSize MyWebView::sizeHint() const
       {
-      return QSize(300 , 600);
+      return QSize(300 * guiScaling, 600 * guiScaling);
       }
 
 //---------------------------------------------------------