Fix for issue musescore#12673: On wide screens, the text in Learn > C…

…lasses is too wide to be comfortably readable (musescore#18167) * Initial Fix Working fix, still need to work on the ClassPage.qml for a better fix * Update ClassesPage.qml Changed the root element to a `StyledFlickable` * Fixed code style and anchors Fixed the code style of the qml file to match the rest of the codebase. Removed right anchors and margin from the Rectangle containing authorInfo
codecruisedor · Jul 4, 2023 · e032187 · e032187
1 parent 5aa3c32
commit e032187
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/learn/qml/MuseScore/Learn/LearnPage.qml b/src/learn/qml/MuseScore/Learn/LearnPage.qml
@@ -114,6 +114,8 @@ FocusScope {
             navigation.panel: navSearchPanel
             navigation.order: 1
 
+            visible: tabBar.currentIndex !== 1 // Not visible for Classes tab
+
             onSearchTextChanged: {
                 pageModel.setSearchText(searchText)
             }

diff --git a/src/learn/qml/MuseScore/Learn/internal/ClassesPage.qml b/src/learn/qml/MuseScore/Learn/internal/ClassesPage.qml
@@ -27,7 +27,7 @@ import QtGraphicalEffects 1.0
 import MuseScore.Ui 1.0
 import MuseScore.UiComponents 1.0
 
-FocusScope {
+StyledFlickable {
     id: root
 
     property string authorName: ""
@@ -41,6 +41,9 @@ FocusScope {
     property alias navigation: navPanel
     property int sideMargin: 46
 
+    contentWidth: parent.width
+    contentHeight: authorInfo.height + sideMargin
+
     NavigationPanel {
         id: navPanel
         name: "Classes"
@@ -61,13 +64,11 @@ FocusScope {
     }
 
     Rectangle {
-        anchors.top: parent.top
         anchors.left: parent.left
         anchors.leftMargin: root.sideMargin
-        anchors.right: parent.right
-        anchors.rightMargin: root.sideMargin
 
         height: authorInfo.height
+        width: Math.min(1000, parent.width - 2 * root.sideMargin)
 
         radius: 12
 
@@ -78,7 +79,8 @@ FocusScope {
 
             anchors.left: parent.left
             anchors.leftMargin: 36
-            anchors.right: parent.horizontalCenter
+            anchors.right: parent.right
+            anchors.rightMargin: 36
             anchors.top: parent.top
             anchors.topMargin: 36
 

diff --git a/src/learn/view/learnpagemodel.cpp b/src/learn/view/learnpagemodel.cpp
@@ -86,7 +86,7 @@ QVariantMap LearnPageModel::classesAuthor() const
                                           "or are a power user eager to explore advanced engraving and playback techniques, "
                                           "my flagship online course Mastering MuseScore "
                                           "covers everything you need to know to get the most out of MuseScore. "
-                                          "In addition, Mastering MuseScore features a supportive community of musicians, "
+                                          "\n\nIn addition, Mastering MuseScore features a supportive community of musicians, "
                                           "with discussion spaces, live streams, "
                                           "and other related courses and services to help you create your best music. "
                                           "Take advantage of this opportunity to learn MuseScore from one of its most recognized experts!");