diff options
Diffstat (limited to 'qt')
| -rw-r--r-- | qt/ScintillaEditBase/Notes.txt | 2 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/PlatQt.cpp | 4 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaQt.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/qt/ScintillaEditBase/Notes.txt b/qt/ScintillaEditBase/Notes.txt index 4abc9bb78..d5d382aa4 100644 --- a/qt/ScintillaEditBase/Notes.txt +++ b/qt/ScintillaEditBase/Notes.txt @@ -10,7 +10,7 @@ There's a comment in the Qt code for Windows: The clocks used aren't great. QTime is a time since midnight clock so wraps around and is only accurate to, at best, milliseconds. -On OS X drawing text into a pixmap moves it around 1 pixel to the right compared to drawing +On macOS drawing text into a pixmap moves it around 1 pixel to the right compared to drawing it directly onto a window. Buffered drawing turned off by default to avoid this. Reported as QTBUG-19483. diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp index 5ce1c1b66..c6163a742 100644 --- a/qt/ScintillaEditBase/PlatQt.cpp +++ b/qt/ScintillaEditBase/PlatQt.cpp @@ -996,7 +996,7 @@ void ListBoxImpl::Create(Window &parent, #endif ); #else - // On OS X, Qt::Tool takes focus so main window loses focus so + // On macOS, Qt::Tool takes focus so main window loses focus so // keyboard stops working. Qt::ToolTip works but its only really // documented for tooltips. // On Linux / X this setting allows clicking on list items. @@ -1068,7 +1068,7 @@ int ListBoxImpl::CaretFromEdge() } int extra; - // The 12 is from trial and error on OS X and the 7 + // The 12 is from trial and error on macOS and the 7 // is from trial and error on Windows - there may be // a better programmatic way to find any padding factors. #ifdef Q_OS_DARWIN diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp index d2635668e..c1276adc1 100644 --- a/qt/ScintillaEditBase/ScintillaQt.cpp +++ b/qt/ScintillaEditBase/ScintillaQt.cpp @@ -35,7 +35,7 @@ ScintillaQt::ScintillaQt(QAbstractScrollArea *parent) imeInteraction = IMEInteraction::Inline; - // On OS X drawing text into a pixmap moves it around 1 pixel to + // On macOS drawing text into a pixmap moves it around 1 pixel to // the right compared to drawing it directly onto a window. // Buffered drawing turned off by default to avoid this. view.bufferedDraw = false; @@ -178,7 +178,7 @@ static void AddRectangularToMime(QMimeData *mimeData, [[maybe_unused]] const QSt // Add an empty marker mimeData->setData(sMSDEVColumnSelect, QByteArray()); #elif defined(Q_OS_MAC) - // OS X gets marker + data to work with other implementations. + // macOS gets marker + data to work with other implementations. // Don't understand how this works but it does - the // clipboard format is supposed to be UTF-16, not UTF-8. mimeData->setData(sScintillaRecMimeType, su.toUtf8()); |