Skip to content

Commit 658f50e

Browse files
committed
Corrected tab stop distance.
1 parent 0f45109 commit 658f50e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+5411
-5407
lines changed

ChangeLog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ V1.1.0
33
* Fixed crash on pasting with empty clipboard.
44
* Fixed a bug in updating widget states after deleting a node.
55
* Fixed text zooming for documents that are saved by the Qt6 version.
6+
* Corrected the tab stop distance.
67
* Added a workaround for a Qt bug related to the current character format.
78
* Added a real Unix signal handler.
89
* Removed "Embed Image" from the toolbar to make it uncluttered.

NEWS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Latest version:
22

3-
26 Nov 2022, V1.1.0
3+
27 Nov 2022, V1.1.0
44

55
See "ChangeLog" for changes.

feathernotes/data/translations/feathernotes.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_ar_DZ.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_be.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_bg.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_ca.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_cs.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_cy.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_da.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_de.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_el.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_eo.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_es.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_et.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_fa.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_fi.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_fr.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_he.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_hr.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_hu.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_id.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_it.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_ja.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_ko.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_lt.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_nb_NO.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_nl.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_pl.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_pt.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_pt_BR.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_ru.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_si.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_sk_SK.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_sv.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_tr.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_uk.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_zh_CN.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/data/translations/feathernotes_zh_HANT.ts

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

feathernotes/fn.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,10 @@ void FN::unZooming()
783783

784784
TextEdit *textEdit = qobject_cast<TextEdit*>(cw);
785785
textEdit->setFont (defaultFont_);
786-
QFontMetricsF metrics (defaultFont_);
786+
/* WARNING: defaultFont_ shouldn't be used below because, as Qt doc explains,
787+
the properties of defaultFont_ are combined with the widget's
788+
default font to form the widget's final font. */
789+
QFontMetricsF metrics (textEdit->font());
787790
textEdit->setTabStopDistance (4 * metrics.horizontalAdvance (' '));
788791

789792
/* this may be a zoom-out */
@@ -2033,7 +2036,7 @@ TextEdit *FN::newWidget()
20332036
/* we want consistent widgets */
20342037
textEdit->setFont (defaultFont_); // needed when the application font changes
20352038
textEdit->document()->setDefaultFont (defaultFont_);
2036-
QFontMetricsF metrics (defaultFont_);
2039+
QFontMetricsF metrics (textEdit->font()); // see unZooming()
20372040
textEdit->setTabStopDistance (4 * metrics.horizontalAdvance (' '));
20382041

20392042
int index = ui->stackedWidget->currentIndex();
@@ -3196,7 +3199,7 @@ void FN::textFontDialog()
31963199
QTextCursor cursor = it.value()->textCursor();
31973200
cursor.select (QTextCursor::Document);
31983201
cursor.mergeCharFormat (fmt);
3199-
QFontMetricsF metrics (defaultFont_);
3202+
QFontMetricsF metrics (it.value()->font()); // see unZooming()
32003203
it.value()->setTabStopDistance (4 * metrics.horizontalAdvance (' '));
32013204
}
32023205

feathernotes/textedit.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1108,7 +1108,7 @@ void TextEdit::zooming (float range)
11081108
if (newSize <= 0) return;
11091109
f.setPointSizeF (static_cast<qreal>(newSize));
11101110
setFont (f);
1111-
QFontMetricsF metrics (f);
1111+
QFontMetricsF metrics (font()); // see FN::unZooming()
11121112
setTabStopDistance (4 * metrics.horizontalAdvance (' '));
11131113

11141114
/* if this is a zoom-out, the text will need

0 commit comments

Comments
 (0)