diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/EditView.cxx | 8 | ||||
| -rw-r--r-- | src/Editor.cxx | 2 | ||||
| -rw-r--r-- | src/ViewStyle.cxx | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/EditView.cxx b/src/EditView.cxx index 3ba7b8560..2774d5f2e 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -840,8 +840,8 @@ ColourRGBA SelectionBackground(const EditModel &model, const ViewStyle &vsDraw, element = Element::SelectionAdditionalBack; if (!model.primarySelection) element = Element::SelectionSecondaryBack; - if (!model.hasFocus && vsDraw.ElementColour(Element::SelectionNoFocusBack)) - element = Element::SelectionNoFocusBack; + if (!model.hasFocus && vsDraw.ElementColour(Element::SelectionInactiveBack)) + element = Element::SelectionInactiveBack; return vsDraw.ElementColour(element).value_or(bugColour); } @@ -854,8 +854,8 @@ std::optional<ColourRGBA> SelectionForeground(const EditModel &model, const View if (!model.primarySelection) // Secondary selection element = Element::SelectionSecondaryText; if (!model.hasFocus) { - if (vsDraw.ElementColour(Element::SelectionNoFocusText)) { - element = Element::SelectionNoFocusText; + if (vsDraw.ElementColour(Element::SelectionInactiveText)) { + element = Element::SelectionInactiveText; } else { return {}; } diff --git a/src/Editor.cxx b/src/Editor.cxx index 29f79e16c..ab09f3f2d 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -7512,7 +7512,7 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) { vs.SetElementAlpha(Element::SelectionBack, alpha); vs.SetElementAlpha(Element::SelectionAdditionalBack, alpha); vs.SetElementAlpha(Element::SelectionSecondaryBack, alpha); - vs.SetElementAlpha(Element::SelectionNoFocusBack, alpha); + vs.SetElementAlpha(Element::SelectionInactiveBack, alpha); InvalidateStyleRedraw(); } break; diff --git a/src/ViewStyle.cxx b/src/ViewStyle.cxx index 8340cd68f..a7e8ba8fe 100644 --- a/src/ViewStyle.cxx +++ b/src/ViewStyle.cxx @@ -204,12 +204,12 @@ void ViewStyle::Init(size_t stylesSize_) { elementColours.erase(Element::SelectionText); elementColours.erase(Element::SelectionAdditionalText); elementColours.erase(Element::SelectionSecondaryText); - elementColours.erase(Element::SelectionNoFocusText); + elementColours.erase(Element::SelectionInactiveText); // Shades of grey for selection backgrounds elementBaseColours[Element::SelectionBack] = ColourRGBA(0xc0, 0xc0, 0xc0, 0xff); elementBaseColours[Element::SelectionAdditionalBack] = ColourRGBA(0xd7, 0xd7, 0xd7, 0xff); elementBaseColours[Element::SelectionSecondaryBack] = ColourRGBA(0xb0, 0xb0, 0xb0, 0xff); - elementBaseColours[Element::SelectionNoFocusBack] = ColourRGBA(0x80, 0x80, 0x80, 0x3f); + elementBaseColours[Element::SelectionInactiveBack] = ColourRGBA(0x80, 0x80, 0x80, 0x3f); elementAllowsTranslucent.insert({ Element::SelectionText, Element::SelectionBack, @@ -217,9 +217,9 @@ void ViewStyle::Init(size_t stylesSize_) { Element::SelectionAdditionalBack, Element::SelectionSecondaryText, Element::SelectionSecondaryBack, - Element::SelectionNoFocusText, + Element::SelectionInactiveText, Element::SelectionBack, - Element::SelectionNoFocusBack, + Element::SelectionInactiveBack, }); selection.layer = Layer::Base; selection.eolFilled = false; @@ -520,7 +520,7 @@ bool ViewStyle::SelectionTextDrawn() const { ElementIsSet(Element::SelectionText) || ElementIsSet(Element::SelectionAdditionalText) || ElementIsSet(Element::SelectionSecondaryText) || - ElementIsSet(Element::SelectionNoFocusText); + ElementIsSet(Element::SelectionInactiveText); } bool ViewStyle::WhitespaceBackgroundDrawn() const { |