From df4b44f4657ef0b2f98d118352281d3f78b17995 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 28 May 2021 09:55:48 +1000 Subject: Rename 'NO_FOCUS' to 'INACTIVE' to better match platform terms. --- src/ViewStyle.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/ViewStyle.cxx') 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 { -- cgit v1.2.3