Update script editor tab width on font change

apps/opencs/view/world/scriptedit.cpp

@@ -48,11 +48,12 @@ CSVWorld::ScriptEdit::ScriptEdit(
     mLineNumberArea(0),
     mDefaultFont(font()),
     mMonoFont(QFont("Monospace")),
+    mTabCharCount(4),
     mDocument(document),
     mWhiteListQoutes("^[a-z|_]{1}[a-z|0-9|_]{0,}$", Qt::CaseInsensitive)
 {
     wrapLines(false);
-    setTabWidth(4);
+    setTabWidth();
     setUndoRedoEnabled (false); // we use OpenCS-wide undo/redo instead
 
     mAllowedTypes <<CSMWorld::UniversalId::Type_Journal
@@ -194,10 +195,10 @@ bool CSVWorld::ScriptEdit::stringNeedsQuote (const std::string& id) const
     return !(string.contains(mWhiteListQoutes));
 }
 
-void CSVWorld::ScriptEdit::setTabWidth(const int numCharacters)
+void CSVWorld::ScriptEdit::setTabWidth()
 {
-    QFontMetrics metrics(mMonoFont);
-    setTabStopWidth(numCharacters * metrics.width(' '));
+    // Set tab width to specified number of characters using current font.
+    setTabStopWidth(mTabCharCount * fontMetrics().width(' '));
 }
 
 void CSVWorld::ScriptEdit::wrapLines(bool wrap)
@@ -222,6 +223,7 @@ void CSVWorld::ScriptEdit::settingChanged(const CSMPrefs::Setting *setting)
     else if (*setting == "Scripts/mono-font")
     {
         setFont(setting->isTrue() ? mMonoFont : mDefaultFont);
+        setTabWidth();
     }
     else if (*setting == "Scripts/show-linenum")
     {
@@ -233,7 +235,8 @@ void CSVWorld::ScriptEdit::settingChanged(const CSMPrefs::Setting *setting)
     }
     else if (*setting == "Scripts/tab-width")
     {
-        setTabWidth(setting->toInt());
+        mTabCharCount = setting->toInt();
+        setTabWidth();
     }
 }
 

apps/opencs/view/world/scriptedit.hpp

@@ -53,6 +53,7 @@ namespace CSVWorld
             LineNumberArea *mLineNumberArea;
             QFont mDefaultFont;
             QFont mMonoFont;
+            int mTabCharCount;
 
         protected:
 
@@ -92,8 +93,7 @@ namespace CSVWorld
             bool stringNeedsQuote(const std::string& id) const;
 
             /// \brief Set tab width for script editor.
-            /// \param numCharacters Number of characters for tab width.
-            void setTabWidth(const int numCharacters);
+            void setTabWidth();
 
             /// \brief Turn line wrapping in script editor on or off.
             /// \param wrap Whether or not to wrap lines.