LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed the min zoom level

Browse source
This commit is contained in:
Roman Pudashkin 2021-06-02 16:46:34 +02:00
parent 626de32e75
commit ce3245bf5e
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/appshell/view/notationstatusbarmodel.cpp
View file

@ -37,6 +37,7 @@ static const QString SELECTED_KEY("selected");
static const QString TYPE_KEY("type");
static const QString CODE_KEY("code");
static const QString VALUE_KEY("value");
static constexpr int MIN_DISPLAYED_ZOOM_PERCENTAGE = 25;
static ActionCode zoomTypeToActionCode(ZoomType type)
{
@ -239,7 +240,9 @@ QVariantList NotationStatusBarModel::availableZoomList() const
return obj;
};
for (int zoom : possibleZoomPercentageList()) {
QList<int> possibleZoomList = possibleZoomPercentageList();
for (int zoom : possibleZoomList) {
result << buildZoomObj(ZoomType::Percentage, zoomPercentageTitle(zoom), zoom);
}
@ -247,7 +250,7 @@ QVariantList NotationStatusBarModel::availableZoomList() const
result << buildZoomObj(ZoomType::WholePage);
result << buildZoomObj(ZoomType::TwoPages);
bool isCustomZoom = m_currentZoomType == ZoomType::Percentage && !possibleZoomPercentageList().contains(currZoomPercentage);
bool isCustomZoom = m_currentZoomType == ZoomType::Percentage && !possibleZoomList.contains(currZoomPercentage);
if (isCustomZoom) {
QVariantMap customZoom = buildZoomObj(ZoomType::Percentage, zoomPercentageTitle(currZoomPercentage), currZoomPercentage);
customZoom[SELECTED_KEY] = true;
@ -317,7 +320,15 @@ void NotationStatusBarModel::dispatch(const actions::ActionCode& code, const act
QList<int> NotationStatusBarModel::possibleZoomPercentageList() const
{
return notationConfiguration()->possibleZoomPercentageList();
QList<int> result;
for (int zoom : notationConfiguration()->possibleZoomPercentageList()) {
if (zoom >= MIN_DISPLAYED_ZOOM_PERCENTAGE) {
result << zoom;
}
}
return result;
}
void NotationStatusBarModel::setConcertPitchEnabled(bool enabled)

2
src/notation/qml/MuseScore/NotationScene/ZoomControl.qml
View file

@ -83,6 +83,8 @@ Row {
}
FlatButton {
width: 20
icon: IconCode.SMALL_ARROW_DOWN
normalStateColor: menu.isMenuOpened ? ui.theme.accentColor : "transparent"