这是indexloc提供的服务，不要输入任何密码
Skip to content

Make custom zoom values accessible with arrow keys or mouse wheel #1926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make custom zoom values accessible with arrow keys or mouse wheel #1926

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0530208
Fix the zoom jumping bug (kinda).
danpish Jul 6, 2025
cb47d54
Format the code a little better
danpish Jul 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 123 additions & 13 deletions app/src/statusbar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ GNU General Public License for more details.
#include <QComboBox>
#include <QLabel>
#include <QLineEdit>
#include <array>

#include "editor.h"
#include "elidedlabel.h"
Expand Down Expand Up @@ -45,23 +46,40 @@ StatusBar::StatusBar(QWidget *parent) : QStatusBar(parent)

QLocale locale;
mZoomBox = new QComboBox(this);
const int originalSizes = 13;
std::array<double, originalSizes> zoomList = {
10000.,
6400.,
1600.,
800.,
400.,
200.,
100.,
75.,
50.,
33.,
25.,
12.,
1.
};
mZoomBox->addItems(QStringList()
<< locale.toString(10000., 'f', 1) + locale.percent()
<< locale.toString(6400., 'f', 1) + locale.percent()
<< locale.toString(1600., 'f', 1) + locale.percent()
<< locale.toString(800., 'f', 1) + locale.percent()
<< locale.toString(400., 'f', 1) + locale.percent()
<< locale.toString(200., 'f', 1) + locale.percent()
<< locale.toString(100., 'f', 1) + locale.percent()
<< locale.toString(75., 'f', 1) + locale.percent()
<< locale.toString(50., 'f', 1) + locale.percent()
<< locale.toString(33., 'f', 1) + locale.percent()
<< locale.toString(25., 'f', 1) + locale.percent()
<< locale.toString(12., 'f', 1) + locale.percent()
<< locale.toString(1., 'f', 1) + locale.percent());
<< locale.toString(zoomList[0], 'f', 1) + locale.percent()
<< locale.toString(zoomList[1], 'f', 1) + locale.percent()
<< locale.toString(zoomList[2], 'f', 1) + locale.percent()
<< locale.toString(zoomList[3], 'f', 1) + locale.percent()
<< locale.toString(zoomList[4], 'f', 1) + locale.percent()
<< locale.toString(zoomList[5], 'f', 1) + locale.percent()
<< locale.toString(zoomList[6], 'f', 1) + locale.percent()
<< locale.toString(zoomList[7], 'f', 1) + locale.percent()
<< locale.toString(zoomList[8], 'f', 1) + locale.percent()
<< locale.toString(zoomList[9], 'f', 1) + locale.percent()
<< locale.toString(zoomList[10], 'f', 1) + locale.percent()
<< locale.toString(zoomList[11], 'f', 1) + locale.percent()
<< locale.toString(zoomList[12], 'f', 1) + locale.percent());
mZoomBox->setMaxCount(mZoomBox->count() + 1);
mZoomBox->setEditable(true);
mZoomBox->lineEdit()->setAlignment(Qt::AlignRight);

#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
connect(mZoomBox, &QComboBox::textActivated, [=](const QString &currentText)
#else
Expand All @@ -74,6 +92,98 @@ StatusBar::StatusBar(QWidget *parent) : QStatusBar(parent)
// insertPolicy is unsuitable as it prevents entering custom values at all
mZoomBox->removeItem(mZoomBox->maxCount() - 1);
}

double currentDouble = locale.toDouble(QString(currentText).remove(locale.percent()));

// Accurate text search
int includedIn = mZoomBox->findText(locale.toString(currentDouble, 'f', 1) + locale.percent());
// qDebug() << "number inserted is in place" << includedIn;

// Needed for the removal of custom values when non-custom is inserted
// Read the TODO below
[[maybe_unused]]bool isInOriginal = false;

for (int index{0}; index < originalSizes; index++)
{
if (currentDouble == zoomList[index])
{
isInOriginal = true;
// qDebug() << "the number inserted is in the original";
}
}

// Insert custom number into the ZoomBox
if (includedIn == -1 && mZoomBox->maxCount() == originalSizes + 1)
{
mZoomBox->setMaxCount(originalSizes + 2);
for(int index{0}; index < mZoomBox->count(); index++)
{
double compTo = locale.toDouble(QString(mZoomBox->itemText(index)).remove(locale.percent()));
if (currentDouble > compTo)
{
mZoomBox->insertItem(index,locale.toString(currentDouble, 'f', 1) + locale.percent());
break;
}
}
}
// Replace the existing custom value if a new one is inserted
else if(includedIn == -1)
{
// Remove the old value
int newMemberPlace = -1;
for (int outOfPlace{0}; outOfPlace < originalSizes; outOfPlace++)
{
double compare = locale.toDouble(QString(mZoomBox->itemText(outOfPlace)).remove(locale.percent()));
if (compare != zoomList[outOfPlace])
{
newMemberPlace = outOfPlace;
// qDebug() << "this index of mZoomBox:" << newMemberPlace << "was not in the original:" << compare;
break;
}
}
if (newMemberPlace == -1)
{
mZoomBox->removeItem(mZoomBox->maxCount() - 1);
}
else
{
mZoomBox->removeItem(newMemberPlace);
}

// Find the correct place and insert the new one
for(int index{0}; index < mZoomBox->count(); index++)
{
double compTo = locale.toDouble(QString(mZoomBox->itemText(index)).remove(locale.percent()));
if (currentDouble > compTo)
{
mZoomBox->insertItem(index,locale.toString(currentDouble, 'f', 1) + locale.percent());
break;
}
}

}
// TODO: Figure out how to differentiate between value change and manual
// keyboard input

// else if(includedIn >= 0 && isInOriginal){
// int newMemberPlace = -1;
// for (int outOfPlace{0}; outOfPlace < originalSizes; outOfPlace++){
// double compare = locale.toDouble(QString(mZoomBox->itemText(outOfPlace)).remove(locale.percent()));
// if (compare != zoomList[outOfPlace]){
// newMemberPlace = outOfPlace;
// qDebug() << "this index of mZoomBox:" << newMemberPlace << "was not in the original:" << compare;
// break;
// }
// }
// if (newMemberPlace == -1){
// mZoomBox->removeItem(mZoomBox->maxCount() - 1);
// }
// else{
// mZoomBox->removeItem(newMemberPlace);
// }
// mZoomBox->setMaxCount(originalSizes + 1);
// }

emit zoomChanged(locale.toDouble(QString(currentText).remove(locale.percent())) / 100);
});
addPermanentWidget(mZoomBox);
Expand Down