From 9162c73355b47219d24ddba152fe931fdfabbcfc Mon Sep 17 00:00:00 2001 From: nyamatongwe Date: Tue, 5 Feb 2013 09:28:07 +1100 Subject: Add allocation of extended styles. --- src/ViewStyle.cxx | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src/ViewStyle.cxx') diff --git a/src/ViewStyle.cxx b/src/ViewStyle.cxx index 059f885f7..b9284c05e 100644 --- a/src/ViewStyle.cxx +++ b/src/ViewStyle.cxx @@ -141,6 +141,7 @@ ViewStyle::ViewStyle(const ViewStyle &source) { // Can't just copy fontname as its lifetime is relative to its owning ViewStyle styles[sty].fontName = fontNames.Save(source.styles[sty].fontName); } + nextExtendedStyle = source.nextExtendedStyle; for (int mrk=0; mrk<=MARKER_MAX; mrk++) { markers[mrk] = source.markers[mrk]; } @@ -226,6 +227,7 @@ void ViewStyle::Init(size_t stylesSize_) { stylesSize = 0; styles = NULL; AllocStyles(stylesSize_); + nextExtendedStyle = 256; fontNames.Clear(); ResetDefaultStyle(); @@ -413,6 +415,16 @@ void ViewStyle::AllocStyles(size_t sizeNew) { stylesSize = sizeNew; } +void ViewStyle::ReleaseAllExtendedStyles() { + nextExtendedStyle = 256; +} + +int ViewStyle::AllocateExtendedStyles(int numberStyles) { + int startRange = static_cast(nextExtendedStyle); + nextExtendedStyle += numberStyles; + return startRange; +} + void ViewStyle::EnsureStyle(size_t index) { if (index >= stylesSize) { size_t sizeNew = stylesSize * 2; @@ -471,4 +483,3 @@ void ViewStyle::CalcLargestMarkerHeight() { } } } - -- cgit v1.2.3