diff options
| author | Neil <nyamatongwe@gmail.com> | 2021-04-25 09:52:20 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2021-04-25 09:52:20 +1000 |
| commit | 81f7847af4cc9f51f02ab191c73f394c457518bd (patch) | |
| tree | ef214ea786c00e9618756c26b99299ac1fa58bf6 /qt | |
| parent | 241f33a38ca0887d1a47399de1bcf7ba0d544c41 (diff) | |
| download | scintilla-mirror-81f7847af4cc9f51f02ab191c73f394c457518bd.tar.gz | |
Feature [feature-requests:#1402]. Unify colour type with ColourAlpha.
Change ColourDesired to ColourAlpha in styles.
Remove ColourDesired.
Diffstat (limited to 'qt')
| -rw-r--r-- | qt/ScintillaEditBase/PlatQt.cpp | 8 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.cpp | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp index 783bdeea8..286441be9 100644 --- a/qt/ScintillaEditBase/PlatQt.cpp +++ b/qt/ScintillaEditBase/PlatQt.cpp @@ -1284,16 +1284,16 @@ void Menu::Show(Point pt, const Window & /*w*/) //---------------------------------------------------------------------- -ColourDesired Platform::Chrome() +ColourAlpha Platform::Chrome() { QColor c(Qt::gray); - return ColourDesired(c.red(), c.green(), c.blue()); + return ColourAlpha(c.red(), c.green(), c.blue()); } -ColourDesired Platform::ChromeHighlight() +ColourAlpha Platform::ChromeHighlight() { QColor c(Qt::lightGray); - return ColourDesired(c.red(), c.green(), c.blue()); + return ColourAlpha(c.red(), c.green(), c.blue()); } const char *Platform::DefaultFont() diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp index 39a2cf49e..7a199b80e 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.cpp +++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp @@ -59,10 +59,10 @@ ScintillaEditBase::ScintillaEditBase(QWidget *parent) setAttribute(Qt::WA_KeyCompression); setAttribute(Qt::WA_InputMethodEnabled); - sqt->vs.indicators[SC_INDICATOR_UNKNOWN] = Indicator(INDIC_HIDDEN, ColourDesired(0, 0, 0xff)); - sqt->vs.indicators[SC_INDICATOR_INPUT] = Indicator(INDIC_DOTS, ColourDesired(0, 0, 0xff)); - sqt->vs.indicators[SC_INDICATOR_CONVERTED] = Indicator(INDIC_COMPOSITIONTHICK, ColourDesired(0, 0, 0xff)); - sqt->vs.indicators[SC_INDICATOR_TARGET] = Indicator(INDIC_STRAIGHTBOX, ColourDesired(0, 0, 0xff)); + sqt->vs.indicators[SC_INDICATOR_UNKNOWN] = Indicator(INDIC_HIDDEN, ColourAlpha(0, 0, 0xff)); + sqt->vs.indicators[SC_INDICATOR_INPUT] = Indicator(INDIC_DOTS, ColourAlpha(0, 0, 0xff)); + sqt->vs.indicators[SC_INDICATOR_CONVERTED] = Indicator(INDIC_COMPOSITIONTHICK, ColourAlpha(0, 0, 0xff)); + sqt->vs.indicators[SC_INDICATOR_TARGET] = Indicator(INDIC_STRAIGHTBOX, ColourAlpha(0, 0, 0xff)); connect(sqt, SIGNAL(notifyParent(SCNotification)), this, SLOT(notifyParent(SCNotification))); |