[Git][freetype/freetype-demos][gsoc-2022-chariri-3] 2 commits: [ftinspec

Charlie Jiang pushed to branch gsoc-2022-chariri-3 at FreeType / FreeType Demo Programs

Commits:

53c3abd3

by Charlie Jiang at 2022-09-01T00:46:09+08:00

[ftinspect] Implement zoom for continuous view.

* src/ftinspect/glyphcomponents/glyphcontinuous.cpp,
  src/ftinspect/glyphcomponents/glyphcontinuous.hpp:
  Support zoom a.k.a scale. Add related signals.

* src/ftinspect/widgets/fontsizeselector.cpp,
  src/ftinspect/widgets/fontsizeselector.hpp:
  Combine zoom factor into the font size selector.

* src/ftinspect/panels/singular.cpp, src/ftinspect/panels/singular.hpp:
  Move out zoom factor widgets.

* src/ftinspect/panels/continuous.cpp, src/ftinspect/panels/continuous.cpp:
  Support zoom. Add related connections.

* src/ftinspect/panels/comparator.cpp, src/ftinspect/panels/comparator.hpp:
  Support zoom. Add missing connections for wheel events of the canvases.

* src/ftinspect/widgets/customwidgets.cpp,
  src/ftinspect/widgets/customwidgets.hpp:
  Change `ZoomSpinBox` to inherit `QDoubleSpinBox` and make it fit for both
  continuous view and singular view which need different steps and ranges..

a37f7509

by Charlie Jiang at 2022-09-01T00:46:18+08:00

* src/ftinspect/panels/info.cpp: Fix SFNT info tab disabled unexpectedly.

13 changed files:

src/ftinspect/glyphcomponents/glyphcontinuous.cpp
src/ftinspect/glyphcomponents/glyphcontinuous.hpp
src/ftinspect/panels/comparator.cpp
src/ftinspect/panels/comparator.hpp
src/ftinspect/panels/continuous.cpp
src/ftinspect/panels/continuous.hpp
src/ftinspect/panels/info.cpp
src/ftinspect/panels/singular.cpp
src/ftinspect/panels/singular.hpp
src/ftinspect/widgets/customwidgets.cpp
src/ftinspect/widgets/customwidgets.hpp
src/ftinspect/widgets/fontsizeselector.cpp
src/ftinspect/widgets/fontsizeselector.hpp

Changes:

src/ftinspect/glyphcomponents/glyphcontinuous.cpp

@@ -135,6 +135,7 @@ GlyphContinuous::paintEvent(QPaintEvent* event)
+ {
    QPainter painter(this);
    painter.fillRect(rect(), backgroundColorCache_);
 +  painter.scale(scale_, scale_);
    if (glyphCache_.empty())
      fillCache();
@@ -148,6 +149,8 @@ GlyphContinuous::wheelEvent(QWheelEvent* event)
    int numSteps = event->angleDelta().y() / 120;
    if (event->modifiers() & Qt::ShiftModifier)
      emit wheelResize(numSteps);
 +  else if (event->modifiers() & Qt::ControlModifier)
 +    emit wheelZoom(numSteps);
    else if (event->modifiers() == 0)
      emit wheelNavigate(-numSteps);
+ }
@@ -189,6 +192,7 @@ GlyphContinuous::mouseMoveEvent(QMouseEvent* event)
    if (event->buttons() != Qt::LeftButton)
      return;
    auto delta = event->pos() - mouseDownPostition_;
 +  delta /= scale_;
    if (source_ == SRC_AllGlyphs)
+   {
      auto deltaIndex = -delta.x() / HorizontalUnitLength
@@ -202,7 +206,9 @@ GlyphContinuous::mouseMoveEvent(QMouseEvent* event)
      positionDelta_.setX(0); // Don't move horizontally
      // but use the renderer
 -    auto horiPos = delta.x() / static_cast<double>(width());
 +    // purpose for two scale_: one for undoing the `delta /= scale_`
 +    // the other for effectively dividing width by the scale
 +    auto horiPos = delta.x() * scale_ * scale_ / static_cast<double>(width());
      horiPos += prevHoriPosition_;
      horiPos = qBound(0.0, horiPos, 1.0);
      stringRenderer_.setPosition(horiPos);
@@ -267,7 +273,9 @@ GlyphContinuous::paintByRenderer()
+     {
        beginSaveLine(pos, size);
      });
 -  displayingCount_ = stringRenderer_.render(width(), height(), beginIndex_);
 +  displayingCount_ = stringRenderer_.render(static_cast<int>(width() / scale_),
 +                                            static_cast<int>(height() / scale_),
 +                                            beginIndex_);
+ }
@@ -566,6 +574,7 @@ GlyphContinuous::findGlyphByMouse(QPoint position,
                                    double* outSizePoint)
+ {
    position -= positionDelta_;
 +  position /= scale_;
    for (auto& line : glyphCache_)
      for (auto& entry : line.entries)
+     {

src/ftinspect/glyphcomponents/glyphcontinuous.hpp

@@ -79,6 +79,7 @@ public:
    void setBeginIndex(int index) { beginIndex_ = index; }
    void setSource(Source source);
    void setMode(Mode mode) { mode_ = mode; }
 +  void setScale(double scale) { scale_ = scale; }
    void setFancyParams(double boldX, double boldY, double slant)
+   {
      boldX_ = boldX;
@@ -100,6 +101,7 @@ public:
  signals:
    void wheelNavigate(int steps);
    void wheelResize(int steps);
 +  void wheelZoom(int steps);
    void beginIndexChangeRequest(int newIndex);
    void displayingCountUpdated(int newCount);
    void rightClickGlyph(int glyphIndex, double sizePoint);
@@ -132,6 +134,7 @@ private:
    bool mouseOperationEnabled_ = true;
    int displayingCount_ = 0;
    FT_Fixed strokeRadiusForSize_ = 0;
 +  double scale_ = 1.0;
    FT_Matrix shearMatrix_;
    FT_Stroker stroker_;

src/ftinspect/panels/comparator.cpp

@@ -86,7 +86,7 @@ ComperatorTab::resizeEvent(QResizeEvent* event)
  void
  ComperatorTab::createLayout()
+ {
 -  sizeSelector_ = new FontSizeSelector(this);
 +  sizeSelector_ = new FontSizeSelector(this, true, true);
    charMapLabel_ = new QLabel(tr("Char Map:"), this);
    charMapSelector_ = new CharMapComboBox(this, engine_, false);
    sourceTextEdit_ = new QPlainTextEdit(QString(ComparatorDefaultText), this);
@@ -168,6 +168,14 @@ ComperatorTab::createConnections()
      connect(panel, &SettingPanel::fontReloadNeeded,
              this, &ComperatorTab::repaintGlyph);
+   }
++
 +  for (auto canvas : canvas_)
 +  {
 +    connect(canvas, &GlyphContinuous::wheelZoom,
 +            this, &ComperatorTab::wheelZoom);
 +    connect(canvas, &GlyphContinuous::wheelResize,
 +            this, &ComperatorTab::wheelResize);
 +  }
+ }
@@ -258,11 +266,26 @@ ComperatorTab::syncSettings(int index)
      return;
    auto canvas = canvas_[index];
 +  canvas->setScale(sizeSelector_->zoomFactor());
    canvas->stringRenderer().setKerning(settingPanel->kerningEnabled());
    canvas->stringRenderer().setLsbRsbDelta(settingPanel->lsbRsbDeltaEnabled());
+ }
 +void
 +ComperatorTab::wheelResize(int steps)
 +{
 +  sizeSelector_->handleWheelResizeBySteps(steps);
 +}
++
++
 +void
 +ComperatorTab::wheelZoom(int steps)
 +{
 +  sizeSelector_->handleWheelZoomBySteps(steps);
 +}
++
++
  namespace
+ {
  const char* ComparatorDefaultText

src/ftinspect/panels/comparator.hpp

@@ -64,6 +64,9 @@ private:
    void reloadGlyphsAndRepaint();
    void sourceTextChanged();
    void syncSettings(int index);
++
 +  void wheelResize(int steps);
 +  void wheelZoom(int steps);
  };

src/ftinspect/panels/continuous.cpp

@@ -80,6 +80,7 @@ ContinuousTab::syncSettings()
    canvas_->setMode(mode);
    canvas_->setSource(src);
    canvas_->setBeginIndex(indexSelector_->currentIndex());
 +  canvas_->setScale(sizeSelector_->zoomFactor());
    auto& sr = canvas_->stringRenderer();
    sr.setWaterfall(waterfallCheckBox_->isChecked());
    sr.setVertical(verticalCheckBox_->isChecked());
@@ -280,6 +281,7 @@ ContinuousTab::showToolTip()
    QToolTip::showText(mapToGlobal(helpButton_->pos()),
                       tr(
  R"(Shift + Scroll: Adjust Font Size
 +Ctrl + Scroll: Adjust Zoom Factor
  Shift + Plus/Minus: Adjust Font Size
  Shift + 0: Reset Font Size to Default
  Left Click: Show Glyph Details Info
@@ -315,6 +317,13 @@ ContinuousTab::wheelNavigate(int steps)
+ }
 +void
 +ContinuousTab::wheelZoom(int steps)
 +{
 +  sizeSelector_->handleWheelZoomBySteps(steps);
 +}
++
++
  void
  ContinuousTab::wheelResize(int steps)
+ {
@@ -329,7 +338,7 @@ ContinuousTab::createLayout()
    canvasFrame_->setFrameStyle(QFrame::StyledPanel | QFrame::Plain);
    canvas_ = new GlyphContinuous(canvasFrame_, engine_);
 -  sizeSelector_ = new FontSizeSelector(this);
 +  sizeSelector_ = new FontSizeSelector(this, false, true);
    indexSelector_ = new GlyphIndexSelector(this);
    indexSelector_->setSingleMode(false);
@@ -494,6 +503,8 @@ ContinuousTab::createConnections()
            this, &ContinuousTab::wheelResize);
    connect(canvas_, &GlyphContinuous::wheelNavigate,
            this, &ContinuousTab::wheelNavigate);
 +  connect(canvas_, &GlyphContinuous::wheelZoom,
 +          this, &ContinuousTab::wheelZoom);
    connect(canvas_, &GlyphContinuous::displayingCountUpdated,
            this, &ContinuousTab::setDisplayingCount);
    connect(canvas_, &GlyphContinuous::rightClickGlyph,

src/ftinspect/panels/continuous.hpp

@@ -75,6 +75,7 @@ protected:
  private slots:
    void wheelNavigate(int steps);
 +  void wheelZoom(int steps);
    void wheelResize(int steps);
  private:

src/ftinspect/panels/info.cpp

@@ -435,8 +435,7 @@ SFNTInfoTab::reloadFont()
+ {
    engine_->reloadFont();
    auto face = engine_->currentFallbackFtFace();
 -  if (!face || !FT_IS_SFNT(face))
 -    setEnabled(false);
 +  setEnabled(face && FT_IS_SFNT(face));
    if (engine_->currentFontSFNTNames() != sfntNamesModel_->storage())
+   {
@@ -1002,11 +1001,12 @@ CompositeGlyphsTab::forceReloadFont()
    std::vector<CompositeGlyphInfo> list;
    CompositeGlyphInfo::get(engine_, list);
 -  if (list == compositeModel_->storage())
 -    return;
 -  compositeModel_->beginModelUpdate();
 -  compositeModel_->storage() = std::move(list);
 -  compositeModel_->endModelUpdate();
 +  if (list != compositeModel_->storage())
 +  {
 +    compositeModel_->beginModelUpdate();
 +    compositeModel_->storage() = std::move(list);
 +    compositeModel_->endModelUpdate();
 +  }
    if (compositeModel_->storage().empty())
+   {

src/ftinspect/panels/singular.cpp

@@ -157,7 +157,7 @@ SingularTab::checkShowPoints()
  void
  SingularTab::zoom()
+ {
 -  int scale = zoomSpinBox_->value();
 +  int scale = static_cast<int>(sizeSelector_->zoomFactor());
    QTransform transform;
    transform.scale(scale, scale);
@@ -198,10 +198,7 @@ void
  SingularTab::wheelZoom(QWheelEvent* event)
+ {
    int numSteps = event->angleDelta().y() / 120;
 -  int zoomAfter = zoomSpinBox_->value() + numSteps;
 -  zoomAfter = std::max(zoomSpinBox_->minimum(),
 -                       std::min(zoomAfter, zoomSpinBox_->maximum()));
 -  zoomSpinBox_->setValue(zoomAfter);
 +  sizeSelector_->handleWheelZoomBySteps(numSteps);
    // TODO: Zoom relative to viewport left-bottom?
+ }
@@ -276,7 +273,7 @@ SingularTab::resizeEvent(QResizeEvent* event)
    auto viewSize = glyphView_->size();
    auto minViewSide = std::min(viewSize.height(), viewSize.width());
 -  zoomSpinBox_->setValue(static_cast<int>(minViewSide / size * 0.7));
 +  sizeSelector_->setZoomFactor(static_cast<int>(minViewSide / size * 0.7));
+ }
@@ -323,15 +320,7 @@ SingularTab::createLayout()
    indexSelector_ = new GlyphIndexSelector(this);
    indexSelector_->setSingleMode(true);
 -  sizeSelector_ = new FontSizeSelector(this);
+-
 -  zoomLabel_ = new QLabel(tr("Zoom Factor"), this);
 -  zoomLabel_->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
 -  zoomSpinBox_ = new ZoomSpinBox(this);
 -  zoomSpinBox_->setAlignment(Qt::AlignRight);
 -  zoomSpinBox_->setRange(1, 1000 - 1000 % 64);
 -  zoomSpinBox_->setKeyboardTracking(false);
 -  zoomLabel_->setBuddy(zoomSpinBox_);
 +  sizeSelector_ = new FontSizeSelector(this, false, false);
    centerGridButton_ = new QPushButton("Go Back to Grid Center", this);
    helpButton_ = new QPushButton("?", this);
@@ -345,7 +334,6 @@ SingularTab::createLayout()
    showAuxLinesCheckBox_ = new QCheckBox(tr("Show Aux. Lines"), this);
    // Tooltips
 -  zoomSpinBox_->setToolTip(tr("Adjust grid zoom."));
    centerGridButton_->setToolTip(tr(
      "Move the viewport so the origin point is at the center of the view."));
    showBitmapCheckBox_->setToolTip(tr("Show glyph bitmap."));
@@ -367,10 +355,7 @@ SingularTab::createLayout()
    sizeLayout_ = new QHBoxLayout;
    sizeLayout_->addStretch(2);
 -  sizeLayout_->addWidget(sizeSelector_, 3);
 -  sizeLayout_->addStretch(1);
 -  sizeLayout_->addWidget(zoomLabel_);
 -  sizeLayout_->addWidget(zoomSpinBox_);
 +  sizeLayout_->addWidget(sizeSelector_, 4);
    sizeLayout_->addStretch(1);
    sizeLayout_->addWidget(centerGridButton_);
    sizeLayout_->addStretch(2);
@@ -411,9 +396,7 @@ SingularTab::createConnections()
            this, &SingularTab::repaintGlyph);
    connect(indexSelector_, &GlyphIndexSelector::currentIndexChanged,
            this, &SingularTab::setGlyphIndex);
+-
 -  connect(zoomSpinBox_, QOverload<int>::of(&QSpinBox::valueChanged),
 -          this, &SingularTab::zoom);
++
    connect(glyphView_, &QGraphicsViewx::shiftWheelEvent,
            this, &SingularTab::wheelResize);
    connect(glyphView_, &QGraphicsViewx::ctrlWheelEvent,
@@ -449,6 +432,7 @@ SingularTab::createConnections()
  void
  SingularTab::repaintGlyph()
+ {
 +  zoom();
    drawGlyph();
+ }
@@ -495,7 +479,6 @@ SingularTab::setDefaults()
+ {
    currentGlyphIndex_ = 0;
 -  zoomSpinBox_->setValue(20);
    showBitmapCheckBox_->setChecked(true);
    showOutlinesCheckBox_->setChecked(true);
    showGridCheckBox_->setChecked(true);

src/ftinspect/panels/singular.hpp

@@ -79,8 +79,6 @@ private:
    GlyphIndexSelector* indexSelector_;
    FontSizeSelector* sizeSelector_;
 -  QLabel* zoomLabel_;
 -  ZoomSpinBox* zoomSpinBox_;
    QPushButton* centerGridButton_;
    QPushButton* helpButton_;

src/ftinspect/widgets/customwidgets.cpp

@@ -63,18 +63,42 @@ QGraphicsViewx::resizeEvent(QResizeEvent* event)
+ }
  // ---------------------------
 -// >>>>>>>> QSpinBoxx <<<<<<<<
 +// >>>>>>>> ZoomSpinBox <<<<<<<<
  // ---------------------------
  // we want to mark the center of a pixel square with a single dot or a small
  // cross; starting with a certain magnification we thus only use even values
  // so that we can do that symmetrically
 +// This behaviour is only for the singular view grid.
 -int
 -ZoomSpinBox::valueFromText(const QString& text) const
++
 +ZoomSpinBox::ZoomSpinBox(QWidget* parent, bool continuousView)
 +: QDoubleSpinBox(parent), continuousView_(continuousView)
+ {
 -  int val = QSpinBox::valueFromText(text);
 +  setKeyboardTracking(false);
 +  if (continuousView)
 +  {
 +    setDecimals(2);
 +    setRange(0.25, 50.0);
 +    setSingleStep(0.25);
 +    setValue(1);
 +  }
 +  else
 +  {
 +    setDecimals(0);
 +    setRange(1, 1000 - 1000 % 64);
 +    setSingleStep(1);
 +    setValue(20);
 +  }
 +}
++
 +double
 +ZoomSpinBox::valueFromText(const QString& text) const
 +{
 +  if (continuousView_)
 +    return QDoubleSpinBox::valueFromText(text);
 +  int val = static_cast<int>(QDoubleSpinBox::valueFromText(text));
    if (val > 640)
      val = val - (val % 64);
    else if (val > 320)
@@ -92,16 +116,16 @@ ZoomSpinBox::valueFromText(const QString& text) const
+ }
 -ZoomSpinBox::ZoomSpinBox(QWidget* parent)
 -: QSpinBox(parent)
 -{
 -}
+-
+-
  void
  ZoomSpinBox::stepBy(int steps)
+ {
 -  int val = value();
 +  if (continuousView_)
 +  {
 +    QDoubleSpinBox::stepBy(steps);
 +    return;
 +  }
++
 +  int val = static_cast<int>(value());
    if (steps > 0)
+   {

src/ftinspect/widgets/customwidgets.hpp

@@ -45,14 +45,17 @@ private:
  // we want to have our own `stepBy' function for the zoom spin box
  class ZoomSpinBox
 -: public QSpinBox
 +: public QDoubleSpinBox
+ {
    Q_OBJECT
  public:
 -  ZoomSpinBox(QWidget* parent);
 +  ZoomSpinBox(QWidget* parent, bool continuousView);
    void stepBy(int val) override;
 -  int valueFromText(const QString& text) const override;
 +  double valueFromText(const QString& text) const override;
++
 +private:
 +  bool continuousView_;
  };

src/ftinspect/widgets/fontsizeselector.cpp

@@ -8,10 +8,12 @@
  #include <algorithm>
 -FontSizeSelector::FontSizeSelector(QWidget* parent)
 -: QWidget(parent)
 +FontSizeSelector::FontSizeSelector(QWidget* parent,
 +                                   bool zoomNewLine,
 +                                   bool continuousView)
 +: QWidget(parent), continuousView_(continuousView)
+ {
 -  createLayout();
 +  createLayout(zoomNewLine);
    createConnections();
    setDefaults();
+ }
@@ -31,6 +33,15 @@ FontSizeSelector::selectedUnit()
+ }
 +double
 +FontSizeSelector::zoomFactor()
 +{
 +  if (continuousView_)
 +    return zoomSpinBox_->value();
 +  return static_cast<int>(zoomSpinBox_->value());
 +}
++
++
  void
  FontSizeSelector::setSizePixel(int sizePixel)
+ {
@@ -47,6 +58,15 @@ FontSizeSelector::setSizePoint(double sizePoint)
+ }
 +void
 +FontSizeSelector::setZoomFactor(double zoomFactor)
 +{
 +  if (continuousView_)
 +    zoomSpinBox_->setValue(zoomFactor);
 +  zoomSpinBox_->setValue(static_cast<int>(zoomFactor));
 +}
++
++
  void
  FontSizeSelector::reloadFromFont(Engine* engine)
+ {
@@ -90,6 +110,17 @@ FontSizeSelector::handleWheelResizeBySteps(int steps)
+ }
 +void
 +FontSizeSelector::handleWheelZoomBySteps(int steps)
 +{
 +  double zoomAfter = zoomSpinBox_->value()
 +                     + steps * zoomSpinBox_->singleStep();
 +  zoomAfter = std::max(zoomSpinBox_->minimum(),
 +                       std::min(zoomAfter, zoomSpinBox_->maximum()));
 +  zoomSpinBox_->setValue(zoomAfter);
 +}
++
++
  void
  FontSizeSelector::handleWheelResizeFromGrid(QWheelEvent* event)
+ {
@@ -173,11 +204,11 @@ FontSizeSelector::checkUnits()
  void
 -FontSizeSelector::createLayout()
 +FontSizeSelector::createLayout(bool zoomNewLine)
+ {
    sizeLabel_ = new QLabel(tr("Size "), this);
    sizeLabel_->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
 -  sizeDoubleSpinBox_ = new QDoubleSpinBox;
 +  sizeDoubleSpinBox_ = new QDoubleSpinBox(this);
    sizeDoubleSpinBox_->setAlignment(Qt::AlignRight);
    sizeDoubleSpinBox_->setDecimals(1);
    sizeDoubleSpinBox_->setRange(1, 500);
@@ -194,6 +225,12 @@ FontSizeSelector::createLayout()
    dpiSpinBox_->setRange(10, 600);
    dpiLabel_->setBuddy(dpiSpinBox_);
 +  zoomLabel_ = new QLabel(tr("Zoom Factor "), this);
 +  zoomLabel_->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
 +  zoomSpinBox_ = new ZoomSpinBox(this, continuousView_);
 +  zoomSpinBox_->setAlignment(Qt::AlignRight);
 +  zoomLabel_->setBuddy(zoomSpinBox_);
++
    // Tooltips
    sizeDoubleSpinBox_->setToolTip(
      tr("Size value (will be limited to available sizes if\nthe current font "
@@ -202,20 +239,36 @@ FontSizeSelector::createLayout()
                                  "the current font is not scalable)."));
    dpiSpinBox_->setToolTip(
      tr("DPI for the point size value (only valid when the unit is point)."));
 +  zoomSpinBox_->setToolTip(tr("Adjust zoom."));
    // Layouting
 -  layout_ = new QHBoxLayout;
+-
 -  layout_->addStretch(1);
 -  layout_->addWidget(sizeLabel_);
 -  layout_->addWidget(sizeDoubleSpinBox_);
 -  layout_->addWidget(unitsComboBox_);
 -  layout_->addStretch(1);
 -  layout_->addWidget(dpiLabel_);
 -  layout_->addWidget(dpiSpinBox_);
 -  layout_->addStretch(1);
+-
 -  setLayout(layout_);
 +  mainLayout_ = new QVBoxLayout;
 +  upLayout_ = new QHBoxLayout;
 +  upLayout_->addStretch(1);
 +  upLayout_->addWidget(sizeLabel_);
 +  upLayout_->addWidget(sizeDoubleSpinBox_);
 +  upLayout_->addWidget(unitsComboBox_);
 +  upLayout_->addStretch(1);
 +  upLayout_->addWidget(dpiLabel_);
 +  upLayout_->addWidget(dpiSpinBox_);
 +  upLayout_->addStretch(1);
 +  if (!zoomNewLine)
 +  {
 +    upLayout_->addWidget(zoomLabel_);
 +    upLayout_->addWidget(zoomSpinBox_);
 +    upLayout_->addStretch(1);
 +    mainLayout_->addLayout(upLayout_);
 +  }
 +  else
 +  {
 +    downLayout_ = new QHBoxLayout;
 +    downLayout_->addWidget(zoomLabel_);
 +    downLayout_->addWidget(zoomSpinBox_, 1);
 +    mainLayout_->addLayout(upLayout_);
 +    mainLayout_->addLayout(downLayout_);
 +  }
++
 +  setLayout(mainLayout_);
    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
+ }
@@ -229,6 +282,8 @@ FontSizeSelector::createConnections()
            this, &FontSizeSelector::checkUnits);
    connect(dpiSpinBox_, QOverload<int>::of(&QSpinBox::valueChanged),
            this, &FontSizeSelector::checkFixedSizeAndEmit);
 +  connect(zoomSpinBox_, QOverload<double>::of(&ZoomSpinBox::valueChanged),
 +          this, &FontSizeSelector::valueChanged);
+ }

src/ftinspect/widgets/fontsizeselector.hpp

@@ -4,6 +4,8 @@
  #pragma once
 +#include "customwidgets.hpp"
++
  #include <QComboBox>
  #include <QDoubleSpinBox>
  #include <QLabel>
@@ -17,7 +19,7 @@ class FontSizeSelector : public QWidget
    Q_OBJECT
  public:
 -  FontSizeSelector(QWidget* parent);
 +  FontSizeSelector(QWidget* parent, bool zoomNewLine, bool continuousView);
    ~FontSizeSelector() override = default;
    enum Units : int
@@ -28,12 +30,15 @@ public:
    double selectedSize();
    Units selectedUnit();
 +  double zoomFactor();
    void setSizePixel(int sizePixel);
    void setSizePoint(double sizePoint);
 +  void setZoomFactor(double zoomFactor);
    void reloadFromFont(Engine* engine);
    void applyToEngine(Engine* engine);
    void handleWheelResizeBySteps(int steps);
 +  void handleWheelZoomBySteps(int steps);
    void handleWheelResizeFromGrid(QWheelEvent* event);
    bool handleKeyEvent(QKeyEvent const* keyEvent);
    void installEventFilterForWidget(QWidget* widget);
@@ -50,18 +55,24 @@ private slots:
  private:
    QLabel* sizeLabel_;
    QLabel* dpiLabel_;
 +  QLabel* zoomLabel_;
    QDoubleSpinBox* sizeDoubleSpinBox_;
    QComboBox* unitsComboBox_;
    QSpinBox* dpiSpinBox_;
 +  ZoomSpinBox* zoomSpinBox_;
 -  QHBoxLayout* layout_;
 +  // Sometimes we need to split 2 lines
 +  QHBoxLayout* upLayout_;
 +  QHBoxLayout* downLayout_;
 +  QVBoxLayout* mainLayout_;
 +  bool continuousView_;
    double lastValue_;
    bool bitmapOnly_ = false;
    std::vector<int> fixedSizes_;
 -  void createLayout();
 +  void createLayout(bool zoomNewLine);
    void createConnections();
    void setDefaults(bool sizeOnly = false);

From:	Charlie Jiang (@cqjjjzr)
Subject:	[Git][freetype/freetype-demos][gsoc-2022-chariri-3] 2 commits: [ftinspect] Implement zoom for continuous view.
Date:	Wed, 31 Aug 2022 16:47:06 +0000