diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-02-28 09:35:08 +0000 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-02-28 09:35:08 +0000 |
| commit | 30d007d8a6bd01960f9c700f69449c82b14f3835 (patch) | |
| tree | b9f71897c8db9fdf2ab2659f8f0841fec60bb7e3 /scintilla/src/ViewStyle.h | |
| parent | 35874e9a390a13de8f1b1a427a712cff3f38a0e1 (diff) | |
| download | notepad2-mod-30d007d8a6bd01960f9c700f69449c82b14f3835.zip notepad2-mod-30d007d8a6bd01960f9c700f69449c82b14f3835.tar.gz notepad2-mod-30d007d8a6bd01960f9c700f69449c82b14f3835.tar.bz2 | |
update scintilla
git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@715 28bd50df-7adb-d945-0439-6e466c6a13cc
Diffstat (limited to 'scintilla/src/ViewStyle.h')
| -rw-r--r-- | scintilla/src/ViewStyle.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scintilla/src/ViewStyle.h b/scintilla/src/ViewStyle.h index 331832e..2087b81 100644 --- a/scintilla/src/ViewStyle.h +++ b/scintilla/src/ViewStyle.h @@ -66,6 +66,7 @@ public: size_t stylesSize;
Style *styles;
LineMarker markers[MARKER_MAX + 1];
+ int largestMarkerHeight;
Indicator indicators[INDIC_MAX + 1];
int technology;
int lineHeight;
@@ -103,7 +104,6 @@ public: enum { margins=5 };
int leftMarginWidth; ///< Spacing margin on left of text
int rightMarginWidth; ///< Spacing margin on left of text
- bool symbolMargin;
int maskInLine; ///< Mask for markers to be put into text because there is nowhere for them to go in margin
MarginStyle ms[margins];
int fixedColumnWidth;
@@ -148,6 +148,7 @@ public: void SetStyleFontName(int styleIndex, const char *name);
bool ProtectionActive() const;
bool ValidStyle(size_t styleIndex) const;
+ void CalcLargestMarkerHeight();
};
#ifdef SCI_NAMESPACE
|