Corrected tab stop distance.

tsujan · Nov 27, 2022 · 658f50e · 658f50e
1 parent 0f45109
commit 658f50e
Show file tree

Hide file tree

Showing 41 changed files with 5,411 additions and 5,407 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -3,6 +3,7 @@ V1.1.0
  * Fixed crash on pasting with empty clipboard.
  * Fixed a bug in updating widget states after deleting a node.
  * Fixed text zooming for documents that are saved by the Qt6 version.
+ * Corrected the tab stop distance.
  * Added a workaround for a Qt bug related to the current character format.
  * Added a real Unix signal handler.
  * Removed "Embed Image" from the toolbar to make it uncluttered.

diff --git a/NEWS b/NEWS
@@ -1,5 +1,5 @@
 Latest version:
 
-	26 Nov 2022, V1.1.0
+	27 Nov 2022, V1.1.0
 
 See "ChangeLog" for changes.
diff --git a/feathernotes/data/translations/feathernotes.ts b/feathernotes/data/translations/feathernotes.ts
diff --git a/feathernotes/data/translations/feathernotes_ar_DZ.ts b/feathernotes/data/translations/feathernotes_ar_DZ.ts
diff --git a/feathernotes/data/translations/feathernotes_be.ts b/feathernotes/data/translations/feathernotes_be.ts
diff --git a/feathernotes/data/translations/feathernotes_bg.ts b/feathernotes/data/translations/feathernotes_bg.ts
diff --git a/feathernotes/data/translations/feathernotes_ca.ts b/feathernotes/data/translations/feathernotes_ca.ts
diff --git a/feathernotes/data/translations/feathernotes_cs.ts b/feathernotes/data/translations/feathernotes_cs.ts
diff --git a/feathernotes/data/translations/feathernotes_cy.ts b/feathernotes/data/translations/feathernotes_cy.ts
diff --git a/feathernotes/data/translations/feathernotes_da.ts b/feathernotes/data/translations/feathernotes_da.ts
diff --git a/feathernotes/data/translations/feathernotes_de.ts b/feathernotes/data/translations/feathernotes_de.ts
diff --git a/feathernotes/data/translations/feathernotes_el.ts b/feathernotes/data/translations/feathernotes_el.ts
diff --git a/feathernotes/data/translations/feathernotes_eo.ts b/feathernotes/data/translations/feathernotes_eo.ts
diff --git a/feathernotes/data/translations/feathernotes_es.ts b/feathernotes/data/translations/feathernotes_es.ts
diff --git a/feathernotes/data/translations/feathernotes_et.ts b/feathernotes/data/translations/feathernotes_et.ts
diff --git a/feathernotes/data/translations/feathernotes_fa.ts b/feathernotes/data/translations/feathernotes_fa.ts
diff --git a/feathernotes/data/translations/feathernotes_fi.ts b/feathernotes/data/translations/feathernotes_fi.ts
diff --git a/feathernotes/data/translations/feathernotes_fr.ts b/feathernotes/data/translations/feathernotes_fr.ts
diff --git a/feathernotes/data/translations/feathernotes_he.ts b/feathernotes/data/translations/feathernotes_he.ts
diff --git a/feathernotes/data/translations/feathernotes_hr.ts b/feathernotes/data/translations/feathernotes_hr.ts
diff --git a/feathernotes/data/translations/feathernotes_hu.ts b/feathernotes/data/translations/feathernotes_hu.ts
diff --git a/feathernotes/data/translations/feathernotes_id.ts b/feathernotes/data/translations/feathernotes_id.ts
diff --git a/feathernotes/data/translations/feathernotes_it.ts b/feathernotes/data/translations/feathernotes_it.ts
diff --git a/feathernotes/data/translations/feathernotes_ja.ts b/feathernotes/data/translations/feathernotes_ja.ts
diff --git a/feathernotes/data/translations/feathernotes_ko.ts b/feathernotes/data/translations/feathernotes_ko.ts
diff --git a/feathernotes/data/translations/feathernotes_lt.ts b/feathernotes/data/translations/feathernotes_lt.ts
diff --git a/feathernotes/data/translations/feathernotes_nb_NO.ts b/feathernotes/data/translations/feathernotes_nb_NO.ts
diff --git a/feathernotes/data/translations/feathernotes_nl.ts b/feathernotes/data/translations/feathernotes_nl.ts
diff --git a/feathernotes/data/translations/feathernotes_pl.ts b/feathernotes/data/translations/feathernotes_pl.ts
diff --git a/feathernotes/data/translations/feathernotes_pt.ts b/feathernotes/data/translations/feathernotes_pt.ts
diff --git a/feathernotes/data/translations/feathernotes_pt_BR.ts b/feathernotes/data/translations/feathernotes_pt_BR.ts
diff --git a/feathernotes/data/translations/feathernotes_ru.ts b/feathernotes/data/translations/feathernotes_ru.ts
diff --git a/feathernotes/data/translations/feathernotes_si.ts b/feathernotes/data/translations/feathernotes_si.ts
diff --git a/feathernotes/data/translations/feathernotes_sk_SK.ts b/feathernotes/data/translations/feathernotes_sk_SK.ts
diff --git a/feathernotes/data/translations/feathernotes_sv.ts b/feathernotes/data/translations/feathernotes_sv.ts
diff --git a/feathernotes/data/translations/feathernotes_tr.ts b/feathernotes/data/translations/feathernotes_tr.ts
diff --git a/feathernotes/data/translations/feathernotes_uk.ts b/feathernotes/data/translations/feathernotes_uk.ts
diff --git a/feathernotes/data/translations/feathernotes_zh_CN.ts b/feathernotes/data/translations/feathernotes_zh_CN.ts
diff --git a/feathernotes/data/translations/feathernotes_zh_HANT.ts b/feathernotes/data/translations/feathernotes_zh_HANT.ts
diff --git a/feathernotes/fn.cpp b/feathernotes/fn.cpp
@@ -783,7 +783,10 @@ void FN::unZooming()
 
     TextEdit *textEdit = qobject_cast<TextEdit*>(cw);
     textEdit->setFont (defaultFont_);
-    QFontMetricsF metrics (defaultFont_);
+    /* WARNING: defaultFont_ shouldn't be used below because, as Qt doc explains,
+                the properties of defaultFont_ are combined with the widget's
+                default font to form the widget's final font. */
+    QFontMetricsF metrics (textEdit->font());
     textEdit->setTabStopDistance (4 * metrics.horizontalAdvance (' '));
 
     /* this may be a zoom-out */
@@ -2033,7 +2036,7 @@ TextEdit *FN::newWidget()
     /* we want consistent widgets */
     textEdit->setFont (defaultFont_); // needed when the application font changes
     textEdit->document()->setDefaultFont (defaultFont_);
-    QFontMetricsF metrics (defaultFont_);
+    QFontMetricsF metrics (textEdit->font()); // see unZooming()
     textEdit->setTabStopDistance (4 * metrics.horizontalAdvance (' '));
 
     int index = ui->stackedWidget->currentIndex();
@@ -3196,7 +3199,7 @@ void FN::textFontDialog()
                     QTextCursor cursor = it.value()->textCursor();
                     cursor.select (QTextCursor::Document);
                     cursor.mergeCharFormat (fmt);
-                    QFontMetricsF metrics (defaultFont_);
+                    QFontMetricsF metrics (it.value()->font()); // see unZooming()
                     it.value()->setTabStopDistance (4 * metrics.horizontalAdvance (' '));
                 }
 

diff --git a/feathernotes/textedit.cpp b/feathernotes/textedit.cpp
@@ -1108,7 +1108,7 @@ void TextEdit::zooming (float range)
     if (newSize <= 0) return;
     f.setPointSizeF (static_cast<qreal>(newSize));
     setFont (f);
-    QFontMetricsF metrics (f);
+    QFontMetricsF metrics (font()); // see FN::unZooming()
     setTabStopDistance (4 * metrics.horizontalAdvance (' '));
 
     /* if this is a zoom-out, the text will need