From 6668b1e4c836023756ab6ae2ab252a19546e3e74 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 11 Aug 2017 09:02:00 +1000 Subject: Backport: Stopped treating SC_TECHNOLOGY_DIRECTWRITERETAIN and SC_TECHNOLOGY_DIRECTWRITEDC as provisional. Backport of changeset 6371:fde8223ca36c. --- doc/ScintillaDoc.html | 20 +++++++------------- doc/ScintillaHistory.html | 4 ++++ include/Scintilla.iface | 2 +- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html index dca0c72f3..b3170a148 100644 --- a/doc/ScintillaDoc.html +++ b/doc/ScintillaDoc.html @@ -116,7 +116,7 @@

Scintilla Documentation

-

Last edited 7 December 2016 NH

+

Last edited 11 August 2017 NH

There is an overview of the internal design of Scintilla.
@@ -3659,19 +3659,16 @@ struct Sci_TextToFind { The technology property allows choosing between different drawing APIs and options. On most platforms, the only choice is SC_TECHNOLOGY_DEFAULT (0). On Windows Vista or later, SC_TECHNOLOGY_DIRECTWRITE (1), - SC_TECHNOLOGY_DIRECTWRITERETAIN (2), or - SC_TECHNOLOGY_DIRECTWRITEDC (3) + SC_TECHNOLOGY_DIRECTWRITERETAIN (2), or + SC_TECHNOLOGY_DIRECTWRITEDC (3) can be chosen to use the Direct2D and DirectWrite APIs for higher quality antialiased drawing. - SC_TECHNOLOGY_DIRECTWRITERETAIN differs from + SC_TECHNOLOGY_DIRECTWRITERETAIN differs from SC_TECHNOLOGY_DIRECTWRITE by requesting that the frame is retained after being presented which may prevent drawing failures on some cards and drivers. - SC_TECHNOLOGY_DIRECTWRITEDC differs from + SC_TECHNOLOGY_DIRECTWRITEDC differs from SC_TECHNOLOGY_DIRECTWRITE by using DirectWrite to draw into a GDI DC. Since Direct2D buffers drawing, Scintilla's buffering can be turned off with - SCI_SETBUFFEREDDRAW(0). - Since SC_TECHNOLOGY_DIRECTWRITERETAIN and - SC_TECHNOLOGY_DIRECTWRITEDC - are provisional, they may be changed or removed in a future release if a better solution is found.

+ SCI_SETBUFFEREDDRAW(0).

SCI_SETFONTQUALITY(int fontQuality)
SCI_GETFONTQUALITY → int
@@ -8106,10 +8103,7 @@ for line = lineStart to lineEnd do SCI_ENSUREVISIBLE(line) next

Provisional features are displayed in this document with a distinctive background colour.

-

There are currently no provisional messages. - The SC_TECHNOLOGY_DIRECTWRITERETAIN and - SC_TECHNOLOGY_DIRECTWRITEDC values for - SCI_SETTECHNOLOGY are provisional.

+

There are currently no provisional messages or values.

Some developers may want to only use features that are stable and have graduated from provisional status. To avoid using provisional messages compile with the symbol diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 81ec9a73f..88a8e636d 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -598,6 +598,10 @@ On Qt, mouse tracking is reenabled when the window is reshown. Bug #1948. +

  • + On Windows, the DirectWrite modes SC_TECHNOLOGY_DIRECTWRITEDC and + SC_TECHNOLOGY_DIRECTWRITERETAIN are no longer provisional. +

    • Release 3.7.6 diff --git a/include/Scintilla.iface b/include/Scintilla.iface index 8cfcb556d..233278145 100644 --- a/include/Scintilla.iface +++ b/include/Scintilla.iface @@ -4877,7 +4877,7 @@ evt void AutoCCompleted=2030(string text, int position, int ch, CompletionMethod evt void MarginRightClick=2031(int modifiers, int position, int margin) evt void AutoCSelectionChange=2032(int listType, string text, int position) -# There are no provisional APIs currently, but some arguments to SCI_SETTECHNOLOGY are provisional. +# There are no provisional APIs currently. cat Provisional -- cgit v1.2.3