diff options
Diffstat (limited to 'src/ViewStyle.h')
| -rw-r--r-- | src/ViewStyle.h | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/src/ViewStyle.h b/src/ViewStyle.h index b15b9163c..39cd77339 100644 --- a/src/ViewStyle.h +++ b/src/ViewStyle.h @@ -74,29 +74,29 @@ public: unsigned int aveCharWidth; unsigned int spaceWidth; bool selforeset; - ColourPair selforeground; - ColourPair selAdditionalForeground; + ColourDesired selforeground; + ColourDesired selAdditionalForeground; bool selbackset; - ColourPair selbackground; - ColourPair selAdditionalBackground; - ColourPair selbackground2; + ColourDesired selbackground; + ColourDesired selAdditionalBackground; + ColourDesired selbackground2; int selAlpha; int selAdditionalAlpha; bool selEOLFilled; bool whitespaceForegroundSet; - ColourPair whitespaceForeground; + ColourDesired whitespaceForeground; bool whitespaceBackgroundSet; - ColourPair whitespaceBackground; - ColourPair selbar; - ColourPair selbarlight; + ColourDesired whitespaceBackground; + ColourDesired selbar; + ColourDesired selbarlight; bool foldmarginColourSet; - ColourPair foldmarginColour; + ColourDesired foldmarginColour; bool foldmarginHighlightColourSet; - ColourPair foldmarginHighlightColour; + ColourDesired foldmarginHighlightColour; bool hotspotForegroundSet; - ColourPair hotspotForeground; + ColourDesired hotspotForeground; bool hotspotBackgroundSet; - ColourPair hotspotBackground; + ColourDesired hotspotBackground; bool hotspotUnderline; bool hotspotSingleLine; /// Margins are ordered: Line Numbers, Selection Margin, Spacing Margin @@ -113,12 +113,12 @@ public: IndentView viewIndentationGuides; bool viewEOL; bool showMarkedLines; - ColourPair caretcolour; - ColourPair additionalCaretColour; + ColourDesired caretcolour; + ColourDesired additionalCaretColour; bool showCaretLineBackground; - ColourPair caretLineBackground; + ColourDesired caretLineBackground; int caretLineAlpha; - ColourPair edgecolour; + ColourDesired edgecolour; int edgeState; int caretStyle; int caretWidth; @@ -140,7 +140,6 @@ public: ~ViewStyle(); void Init(size_t stylesSize_=64); void CreateFont(const FontSpecification &fs); - void RefreshColourPalette(Palette &pal, bool want); void Refresh(Surface &surface); void AllocStyles(size_t sizeNew); void EnsureStyle(size_t index); |