Closed Abhay-Varnekar closed 2 days ago
use git pull --rebase upstream master; git push -f
and squash your 2 commits into one, after having fixes the trailing spaces
That editstyle.ui change should not be in this PR
That editstyle.ui change should not be in this PR
Yess removed it
Strange, I now don't see where that codestyle check failure comes from
Strange, I now don't see where that codestyle check failure comes from
Yess I too am not able to figure out the issue here as I used the code from the main repo and made mine changes keeping in mind the trailing spaces
This is the problem:
diff --git a/src/palette/view/widgets/timedialog.cpp b/src/palette/view/widgets/timedialog.cpp
index 342d3b7..1458987 100644
--- a/src/palette/view/widgets/timedialog.cpp
+++ b/src/palette/view/widgets/timedialog.cpp
@@ -154,7 +154,7 @@ void TimeDialog::zChanged()
int denominator = this->denominator();
Fraction sig(numerator, denominator);
-
+
// Update beam groups view
groups->setSig(sig, Groups::endings(sig), zText->text(), nText->text());
}
On blank lines, no indentation should be applied.
I don't see that one on GitHub though
This is the problem:
diff --git a/src/palette/view/widgets/timedialog.cpp b/src/palette/view/widgets/timedialog.cpp index 342d3b7..1458987 100644 --- a/src/palette/view/widgets/timedialog.cpp +++ b/src/palette/view/widgets/timedialog.cpp @@ -154,7 +154,7 @@ void TimeDialog::zChanged() int denominator = this->denominator(); Fraction sig(numerator, denominator); - + // Update beam groups view groups->setSig(sig, Groups::endings(sig), zText->text(), nText->text()); }
On blank lines, no indentation should be applied.
Thanks a lot for pointing it out. I will make sure to note this and not make such mistakes hereafter.
Tested on MacOS 14, Windows 11, Ubuntu 22.04.3. Approved https://github.com/musescore/MuseScore/issues/12970 FIXED
Resolves: #12970
Summary of Changes:
999
to the numerator field (zNominal
) to restrict user input.