diff options
| author | Neil <nyamatongwe@gmail.com> | 2021-05-22 08:18:01 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2021-05-22 08:18:01 +1000 |
| commit | c8235ba0e0292f209a8233613669e2cff8de80da (patch) | |
| tree | 117df121f92601300eeb2e9a047860384eb17d79 /src/Platform.h | |
| parent | 7f8a8cfb32aecb70fe10ef26fe096f4092f7e673 (diff) | |
| download | scintilla-mirror-c8235ba0e0292f209a8233613669e2cff8de80da.tar.gz | |
Rename ColourAlpha to ColourRGBA to avoid clashes when a ColourAlpha typedef
will be published in externally visible header.
Diffstat (limited to 'src/Platform.h')
| -rw-r--r-- | src/Platform.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/Platform.h b/src/Platform.h index 2d14da96e..f279b80cd 100644 --- a/src/Platform.h +++ b/src/Platform.h @@ -225,15 +225,15 @@ public: virtual std::unique_ptr<IScreenLineLayout> Layout(const IScreenLine *screenLine) = 0; - virtual void DrawTextNoClip(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourAlpha fore, ColourAlpha back) = 0; - virtual void DrawTextClipped(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourAlpha fore, ColourAlpha back) = 0; - virtual void DrawTextTransparent(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourAlpha fore) = 0; + virtual void DrawTextNoClip(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, ColourRGBA back) = 0; + virtual void DrawTextClipped(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, ColourRGBA back) = 0; + virtual void DrawTextTransparent(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore) = 0; virtual void MeasureWidths(const Font *font_, std::string_view text, XYPOSITION *positions) = 0; virtual XYPOSITION WidthText(const Font *font_, std::string_view text) = 0; - virtual void DrawTextNoClipUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourAlpha fore, ColourAlpha back) = 0; - virtual void DrawTextClippedUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourAlpha fore, ColourAlpha back) = 0; - virtual void DrawTextTransparentUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourAlpha fore) = 0; + virtual void DrawTextNoClipUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, ColourRGBA back) = 0; + virtual void DrawTextClippedUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, ColourRGBA back) = 0; + virtual void DrawTextTransparentUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore) = 0; virtual void MeasureWidthsUTF8(const Font *font_, std::string_view text, XYPOSITION *positions) = 0; virtual XYPOSITION WidthTextUTF8(const Font *font_, std::string_view text) = 0; @@ -304,10 +304,10 @@ public: }; struct ListOptions { - std::optional<ColourAlpha> fore; - std::optional<ColourAlpha> back; - std::optional<ColourAlpha> foreSelected; - std::optional<ColourAlpha> backSelected; + std::optional<ColourRGBA> fore; + std::optional<ColourRGBA> back; + std::optional<ColourRGBA> foreSelected; + std::optional<ColourRGBA> backSelected; }; class ListBox : public Window { @@ -357,8 +357,8 @@ public: */ namespace Platform { -ColourAlpha Chrome(); -ColourAlpha ChromeHighlight(); +ColourRGBA Chrome(); +ColourRGBA ChromeHighlight(); const char *DefaultFont(); int DefaultFontSize(); unsigned int DoubleClickTime(); |