diff options
| author | XhmikosR <xhmikosr@gmail.com> | 2015-03-07 12:05:41 +0200 |
|---|---|---|
| committer | XhmikosR <xhmikosr@gmail.com> | 2015-03-09 08:44:41 +0200 |
| commit | 4ac30880a3dd4769bb5f1287e90aa0db9ede212c (patch) | |
| tree | 7d237930bb68fc714efc6945eae98ae7df3f6dbe /scintilla/src/ViewStyle.cxx | |
| parent | 12949f79fc6487022b0ffea17dd9eadd43d5b1c0 (diff) | |
| download | notepad2-mod-4ac30880a3dd4769bb5f1287e90aa0db9ede212c.zip notepad2-mod-4ac30880a3dd4769bb5f1287e90aa0db9ede212c.tar.gz notepad2-mod-4ac30880a3dd4769bb5f1287e90aa0db9ede212c.tar.bz2 | |
Update Scintilla to v3.5.4.4.2.25.945
Diffstat (limited to 'scintilla/src/ViewStyle.cxx')
| -rw-r--r-- | scintilla/src/ViewStyle.cxx | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/scintilla/src/ViewStyle.cxx b/scintilla/src/ViewStyle.cxx index 8a62a90..d815614 100644 --- a/scintilla/src/ViewStyle.cxx +++ b/scintilla/src/ViewStyle.cxx @@ -101,8 +101,14 @@ ViewStyle::ViewStyle(const ViewStyle &source) { markers[mrk] = source.markers[mrk];
}
CalcLargestMarkerHeight();
+ indicatorsDynamic = 0;
+ indicatorsSetFore = 0;
for (int ind=0; ind<=INDIC_MAX; ind++) {
indicators[ind] = source.indicators[ind];
+ if (indicators[ind].IsDynamic())
+ indicatorsDynamic++;
+ if (indicators[ind].OverridesTextFore())
+ indicatorsSetFore++;
}
selColours = source.selColours;
@@ -197,6 +203,8 @@ void ViewStyle::Init(size_t stylesSize_) { indicators[2] = Indicator(INDIC_PLAIN, ColourDesired(0xff, 0, 0));
technology = SC_TECHNOLOGY_DEFAULT;
+ indicatorsDynamic = 0;
+ indicatorsSetFore = 0;
lineHeight = 1;
lineOverlap = 0;
maxAscent = 1;
@@ -318,6 +326,14 @@ void ViewStyle::Refresh(Surface &surface, int tabInChars) { FontRealised *fr = Find(styles[k]);
styles[k].Copy(fr->font, *fr);
}
+ indicatorsDynamic = 0;
+ indicatorsSetFore = 0;
+ for (int ind = 0; ind <= INDIC_MAX; ind++) {
+ if (indicators[ind].IsDynamic())
+ indicatorsDynamic++;
+ if (indicators[ind].OverridesTextFore())
+ indicatorsSetFore++;
+ }
maxAscent = 1;
maxDescent = 1;
FindMaxAscentDescent();
|