fix #16077 part 2: Double click a header/footer to open the corresponding menu #5887

SKefalidis · 2020-03-29T16:29:53Z

Resolves: https://musescore.org/en/node/16077

Related PR: #5886

Added the ability to double click a header/footer to go their menu (dialog).

First of all, to be able to double click you need to be able to select. Headers/footers were not selectable because they were not in Page->items, which means that they were not in the bspTree. Adding them to the bspTree causes graphical glitches and it requires extensive workarounds to bypass the constness of Page::draw. That's why they are added manually in ScoreView::elementsNear.

After giving them the ability to be selected, they need to be non-editable, which means setting their flag to generated and disabling their inspector. Editing them via the inspector causes more graphical glitches and makes the logic in ScoreView::mouseDoubleClickEvent more complex. If we want the ability to edit them via the inspector, more extensive changes have to be made.

Edited for the latest push: I changed the way headers/footers are stored in the program to enable the ability to click any one of the 3 headers/footers to go to the dialog. While doing that I changed the pointer initialization to nullptr and converted some things to the new representation (which uses vectors).

I signed CLA
I made sure the code in the PR follows the coding rules
I made sure the code compiles on my machine
I made sure there are no unnecessary changes in the code
I made sure the title of the PR reflects the core meaning of the issue you are solving
I made sure the commit message(s) contain a description and answer the question "Why do those changes fix that particular issue?" or "Why are those changes really necessary as improvements?"
I made sure the commit message title starts with "fix #424242:" if there is a related issue
[n\a] I created the test (mtest, vtest, script test) to verify the changes I made

IsaacWeiss · 2020-03-29T16:43:46Z

mscore/editstyle.cpp

@@ -735,6 +735,7 @@ const std::map<ElementType, EditStylePage> EditStyle::PAGES = {
      { ElementType::FIGURED_BASS,        &EditStyle::PageFiguredBass },
      { ElementType::HARMONY,             &EditStyle::PageChordSymbols },
      { ElementType::FRET_DIAGRAM,        &EditStyle::PageFretboardDiagrams },
+      { ElementType::TEXT,                &EditStyle::PageHeaderFooter }, // gotoElement if the element is Text leads to the footer dialog


Wouldn't this also catch other text elements?

It will, as I explained in the original message. It does not cause an immediate problem. In the future, it might, but adding friends is also a problem and this is very elegant (if I may so myself) because it does not change much but acomplishes it's goal. In my opinion headers/footers need to be reworked.

Just to be clear, this adds "Style..." to the context menu for every text element, and all of them go to the Header/Footer page.

You are right, I hadn't seen that connection. I'll change this then.

@IsaacWeiss I can think of 3 solutions. Either through 'friend' (like the PR mentioned in the op) or by hardcoding the value of the page and having a unit test to check if the value is correct. I could also create a special 'gotoFooterHeader' for this case.

IsaacWeiss · 2020-03-29T16:44:15Z

mscore/events.cpp

+                  cout << "success" << endl;
+                  }
+            return;
+      }


Indentation style

@SKefalidis unaddressed comment ^

IsaacWeiss · 2020-03-29T16:46:08Z

mscore/events.cpp

            return;
+      else if (!clickedElement->isEditable()) {
+            if (clickedElement->isText()
+                && (static_cast<Text*>(clickedElement)->tid() == Tid::FOOTER || static_cast<Text*>(clickedElement)->tid() == Tid::HEADER)) { // double-click an instrument name to open the edit staff/part properties menu


You can use toText(clickedElement) as a shortcut for the static_cast

IsaacWeiss · 2020-03-29T16:46:27Z

mscore/events.cpp

+            if (clickedElement->isText()
+                && (static_cast<Text*>(clickedElement)->tid() == Tid::FOOTER || static_cast<Text*>(clickedElement)->tid() == Tid::HEADER)) { // double-click an instrument name to open the edit staff/part properties menu
+                  elementPropertyAction("style", clickedElement);
+                  cout << "success" << endl;


Debugging artifact?

You are right, this one got away, will fix that.

IsaacWeiss · 2020-03-29T16:47:16Z

mscore/scoreview.cpp

@@ -4727,6 +4727,10 @@ QList<Element*> ScoreView::elementsNear(QPointF p)
      QRectF r(p.x() - w, p.y() - w, 3.0 * w, 3.0 * w);

      QList<Element*> el = page->items(r);
+      if(score()->headerText() != nullptr)      // gives the ability to select the header


Space after if

SKefalidis · 2020-03-29T16:57:22Z

Fixed formatting.

SKefalidis · 2020-03-29T19:25:16Z

Everything should be in order now.

igorkorsukov · 2020-04-17T08:33:30Z

libmscore/score.cpp

-            headerText()->styleChanged();
-      if (footerText())
-            footerText()->styleChanged();
+      for(int i = 0; i < 3; i++) {


Space after for

igorkorsukov · 2020-04-17T08:34:14Z

libmscore/score.cpp

-            headerText()->styleChanged();
-      if (footerText())
-            footerText()->styleChanged();
+      for(int i = 0; i < 3; i++) {


I think here you need to add a comment what is 3

igorkorsukov · 2020-04-17T08:36:09Z

libmscore/score.h

-      Text* _headerText  { 0 };
-      Text* _footerText  { 0 };
+      vector<Text*> _headersText  { nullptr, nullptr, nullptr };
+      vector<Text*> _footersText  { nullptr, nullptr, nullptr };


Please add std before vector (std::vector)

igorkorsukov · 2020-04-17T08:38:08Z

libmscore/score.h

-      Text* _headerText  { 0 };
-      Text* _footerText  { 0 };
+      vector<Text*> _headersText  { nullptr, nullptr, nullptr };
+      vector<Text*> _footersText  { nullptr, nullptr, nullptr };


I think here you need to add a comment why three

igorkorsukov · 2020-04-17T08:40:38Z

mscore/events.cpp

            return;
+      else if (!clickedElement->isEditable()) {


I think there is no need for else

if (!clickedElement) return; if (!clickedElement->isEditable()) { ... return } ...

igorkorsukov · 2020-04-17T08:41:39Z

mscore/inspector/inspector.cpp

-                                    ie = new InspectorText(this);
+                              if (element()->isText()) {
+                                    // don't allow footers/headers to be edited via the inspector
+                                    if(toText(element())->tid() != Tid::FOOTER && toText(element())->tid() != Tid::HEADER)


Space after if

igorkorsukov · 2020-04-17T08:46:15Z

mscore/scoreview.cpp

@@ -4727,6 +4727,12 @@ QList<Element*> ScoreView::elementsNear(QPointF p)
      QRectF r(p.x() - w, p.y() - w, 3.0 * w, 3.0 * w);

      QList<Element*> el = page->items(r);
+      for(int i = 0; i < 3; i++) {


I think here you need to add a comment what is 3
I think it's even better to add a constant (mscore.h), since it is used in several places.
The name of the constant will show what it is and where it is used.

SKefalidis · 2020-04-17T10:36:23Z

Updated as advised by @igorkorsukov

anatoly-os · 2020-04-28T12:15:21Z

libmscore/page.cpp

                  }
            }
      else {
-            text = score()->footerText();
+            text = score()->footerText(area - 3); // because they are 3 4 5


Isn't it better to replace area - 3 with area - MAX_FOOTERS?

anatoly-os · 2020-04-28T12:15:38Z

mscore/events.cpp

+                  cout << "success" << endl;
+                  }
+            return;
+      }


@SKefalidis unaddressed comment ^

anatoly-os · 2020-04-28T12:16:21Z

@SKefalidis two comments remain unaddressed and rebase is needed.

…corresponding menu

SKefalidis · 2020-04-28T12:51:52Z

@anatoly-os Rebase completed, suggestions incorporated.

IsaacWeiss reviewed Mar 29, 2020

View reviewed changes

SKefalidis force-pushed the dc-footer branch from df7fb22 to d3778e4 Compare March 29, 2020 16:57

SKefalidis force-pushed the dc-footer branch 2 times, most recently from de8bf75 to 18e458d Compare March 29, 2020 19:22

MarcSabatella mentioned this pull request Apr 16, 2020

MuseScore 3.5 Alpha PRs to be merged #5960

Closed

igorkorsukov reviewed Apr 17, 2020

View reviewed changes

SKefalidis force-pushed the dc-footer branch 2 times, most recently from 9d7f417 to 79fd942 Compare April 17, 2020 10:28

SKefalidis requested a review from igorkorsukov April 17, 2020 10:36

igorkorsukov approved these changes Apr 17, 2020

View reviewed changes

Spire42 approved these changes Apr 17, 2020

View reviewed changes

anatoly-os reviewed Apr 28, 2020

View reviewed changes

SKefalidis force-pushed the dc-footer branch from 79fd942 to e40ed95 Compare April 28, 2020 12:36

fix musescore#16077 part 2: Double click a header/footer to open the …

c5be1af

…corresponding menu

SKefalidis force-pushed the dc-footer branch from e40ed95 to c5be1af Compare April 28, 2020 12:38

anatoly-os merged commit 81662a2 into musescore:master Apr 29, 2020

SKefalidis mentioned this pull request May 7, 2020

fix #304957: moving headers/footers causes a crash #6053

Closed

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix #16077 part 2: Double click a header/footer to open the corresponding menu #5887

fix #16077 part 2: Double click a header/footer to open the corresponding menu #5887

SKefalidis commented Mar 29, 2020 •

edited

Loading

IsaacWeiss Mar 29, 2020

SKefalidis Mar 29, 2020 •

edited

Loading

IsaacWeiss Mar 29, 2020

SKefalidis Mar 29, 2020

SKefalidis Mar 29, 2020 •

edited

Loading

IsaacWeiss Mar 29, 2020

anatoly-os Apr 28, 2020

IsaacWeiss Mar 29, 2020

SKefalidis Mar 29, 2020

IsaacWeiss Mar 29, 2020

SKefalidis Mar 29, 2020

IsaacWeiss Mar 29, 2020

SKefalidis commented Mar 29, 2020

SKefalidis commented Mar 29, 2020

igorkorsukov Apr 17, 2020

igorkorsukov Apr 17, 2020 •

edited

Loading

igorkorsukov Apr 17, 2020

igorkorsukov Apr 17, 2020

igorkorsukov Apr 17, 2020

igorkorsukov Apr 17, 2020

igorkorsukov Apr 17, 2020

SKefalidis commented Apr 17, 2020

anatoly-os Apr 28, 2020

anatoly-os Apr 28, 2020

anatoly-os commented Apr 28, 2020

SKefalidis commented Apr 28, 2020

fix #16077 part 2: Double click a header/footer to open the corresponding menu #5887

fix #16077 part 2: Double click a header/footer to open the corresponding menu #5887

Conversation

SKefalidis commented Mar 29, 2020 • edited Loading

Choose a reason for hiding this comment

SKefalidis Mar 29, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SKefalidis Mar 29, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SKefalidis commented Mar 29, 2020

SKefalidis commented Mar 29, 2020

Choose a reason for hiding this comment

igorkorsukov Apr 17, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SKefalidis commented Apr 17, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

anatoly-os commented Apr 28, 2020

SKefalidis commented Apr 28, 2020

SKefalidis commented Mar 29, 2020 •

edited

Loading

SKefalidis Mar 29, 2020 •

edited

Loading

SKefalidis Mar 29, 2020 •

edited

Loading

igorkorsukov Apr 17, 2020 •

edited

Loading