[freetype2-demos] gsoc-2022-chariri-2 22c49c3 26/30: [ftinspect] Minor sorting and renaming.

[Werner Lemberg]

branch: gsoc-2022-chariri-2
commit 22c49c378dc4086e5ae6474e1becb0fe27c26ffb
Author: Charlie Jiang <w@chariri.moe>
Commit: Charlie Jiang <w@chariri.moe>

    [ftinspect] Minor sorting and renaming.
    
    * src/ftinspect/panels/continuous.cpp, src/ftinspect/panels/continuous.hpp:
      Sort `updateFromCurrentSubTab`; make `setGlyphCount` update limit index as
      well; rename `updateCharMapLimit` to `updateLimitIndex`.
    
    * src/ftinspect/panels/settingpanel.cpp,
      src/ftinspect/panels/settingpanel.hpp: Remove `checkLCDFilter`; eliminate
      unnecessary updates.
---
 src/ftinspect/panels/continuous.cpp   | 19 +++++++++++++------
 src/ftinspect/panels/continuous.hpp   |  4 ++--
 src/ftinspect/panels/settingpanel.cpp | 16 ++++------------
 src/ftinspect/panels/settingpanel.hpp |  1 -
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/ftinspect/panels/continuous.cpp 
b/src/ftinspect/panels/continuous.cpp
index 452b690..c296530 100644
--- a/src/ftinspect/panels/continuous.cpp
+++ b/src/ftinspect/panels/continuous.cpp
@@ -123,12 +123,12 @@ ContinuousTab::updateFromCurrentSubTab()
   switch (tabWidget_->currentIndex())
   {
   case AllGlyphs:
+    canvas_->setMode(GlyphContinuous::AllGlyphs);
+    canvas_->setSubModeAllGlyphs(allGlyphsTab_->subMode());
     // Begin index is selected from All Glyphs subtab,
     // and Limit index is calculated by All Glyphs subtab
     canvas_->setBeginIndex(allGlyphsTab_->glyphBeginindex());
     canvas_->setLimitIndex(allGlyphsTab_->glyphLimitIndex());
-    canvas_->setMode(GlyphContinuous::AllGlyphs);
-    canvas_->setSubModeAllGlyphs(allGlyphsTab_->subMode());
     canvas_->setCharMapIndex(allGlyphsTab_->charMapIndex());
     break;
   }
@@ -185,7 +185,14 @@ void
 ContinousAllGlyphsTab::setGlyphBeginindex(int index)
 {
   indexSelector_->setCurrentIndex(index);
-  updateCharMapLimit();
+}
+
+
+void
+ContinousAllGlyphsTab::setGlyphCount(int count)
+{
+  currentGlyphCount_ = count;
+  updateLimitIndex();
 }
 
 
@@ -240,12 +247,12 @@ ContinousAllGlyphsTab::setCharMaps(QVector<CharMapInfo>& 
charMaps)
     charMapSelector_->setCurrentIndex(newIndex);
   }
 
-  updateCharMapLimit();
+  updateLimitIndex();
 }
 
 
 void
-ContinousAllGlyphsTab::updateCharMapLimit()
+ContinousAllGlyphsTab::updateLimitIndex()
 {
   if (charMapSelector_->currentIndex() <= 0)
     glyphLimitIndex_ = currentGlyphCount_;
@@ -324,7 +331,7 @@ ContinousAllGlyphsTab::charMapChanged()
     else
       setGlyphBeginindex(0x20);
   }
-  updateCharMapLimit();
+  updateLimitIndex();
 
   emit changed();
 
diff --git a/src/ftinspect/panels/continuous.hpp 
b/src/ftinspect/panels/continuous.hpp
index cf6b2f5..fb37928 100644
--- a/src/ftinspect/panels/continuous.hpp
+++ b/src/ftinspect/panels/continuous.hpp
@@ -85,12 +85,12 @@ public:
   void setGlyphBeginindex(int index);
 
   // This doesn't trigger immediate repaint
-  void setGlyphCount(int count) { currentGlyphCount_ = count; }
+  void setGlyphCount(int count);
   void setDisplayingCount(int count);
 
   void setCharMaps(QVector<CharMapInfo>& charMaps);
   // This doesn't trigger either.
-  void updateCharMapLimit();
+  void updateLimitIndex();
 
 signals:
   void changed();
diff --git a/src/ftinspect/panels/settingpanel.cpp 
b/src/ftinspect/panels/settingpanel.cpp
index 5781865..25d5c06 100644
--- a/src/ftinspect/panels/settingpanel.cpp
+++ b/src/ftinspect/panels/settingpanel.cpp
@@ -28,7 +28,6 @@ SettingPanel::checkAllSettings()
   checkHinting();
   checkAutoHinting();
   checkAntiAliasing();
-  checkLCDFilter();
 }
 
 
@@ -56,7 +55,7 @@ SettingPanel::checkHinting()
     }
 
     autoHintingCheckBox_->setEnabled(true);
-    checkAutoHinting();
+    checkAutoHinting(); // this will emit repaint
   }
   else
   {
@@ -74,9 +73,9 @@ SettingPanel::checkHinting()
       == AntiAliasingComboBoxModel::AntiAliasing_Light)
       antiAliasingComboBox_->setCurrentIndex(
         AntiAliasingComboBoxModel::AntiAliasing_Normal);
-  }
 
-  emit repaintNeeded();
+    emit repaintNeeded();
+  }
 }
 
 
@@ -167,13 +166,6 @@ SettingPanel::checkAntiAliasing()
 }
 
 
-void
-SettingPanel::checkLCDFilter()
-{
-  emit repaintNeeded();
-}
-
-
 void
 SettingPanel::syncSettings()
 {
@@ -207,7 +199,7 @@ SettingPanel::createConnections()
           this, &SettingPanel::checkAntiAliasing);
   connect(lcdFilterComboBox_, 
           QOverload<int>::of(&QComboBox::currentIndexChanged),
-          this, &SettingPanel::checkLCDFilter);
+          this, &SettingPanel::repaintNeeded);
 
   connect(gammaSlider_, &QSlider::valueChanged,
           this, &SettingPanel::repaintNeeded);
diff --git a/src/ftinspect/panels/settingpanel.hpp 
b/src/ftinspect/panels/settingpanel.hpp
index c237295..b27c531 100644
--- a/src/ftinspect/panels/settingpanel.hpp
+++ b/src/ftinspect/panels/settingpanel.hpp
@@ -40,7 +40,6 @@ public slots:
   void checkHintingMode();
   void checkAutoHinting();
   void checkAntiAliasing();
-  void checkLCDFilter();
 
 private:
   Engine* engine_;