aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ViewStyle.h
diff options
context:
space:
mode:
authornyamatongwe <devnull@localhost>2011-09-09 16:59:38 +1000
committernyamatongwe <devnull@localhost>2011-09-09 16:59:38 +1000
commite00160f45844f28985e11540aa62a96a2fcb0146 (patch)
tree4f4c1f6692ed01d6f6c4f5361935a07328158131 /src/ViewStyle.h
parentec3e2ca261c8a98fd0786c151a737ad12ed637f4 (diff)
parent8ab9f0c333bb0c9ef944d91d940c516b65b0384e (diff)
downloadscintilla-mirror-e00160f45844f28985e11540aa62a96a2fcb0146.tar.gz
Merge with main repository.
Diffstat (limited to 'src/ViewStyle.h')
-rw-r--r--src/ViewStyle.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ViewStyle.h b/src/ViewStyle.h
index b038a9b54..b15b9163c 100644
--- a/src/ViewStyle.h
+++ b/src/ViewStyle.h
@@ -48,7 +48,7 @@ public:
FontRealised *frNext;
FontRealised(const FontSpecification &fs);
virtual ~FontRealised();
- void Realise(Surface &surface, int zoomLevel);
+ void Realise(Surface &surface, int zoomLevel, int technology);
FontRealised *Find(const FontSpecification &fs);
void FindMaxAscentDescent(unsigned int &maxAscent, unsigned int &maxDescent);
};
@@ -67,6 +67,7 @@ public:
Style *styles;
LineMarker markers[MARKER_MAX + 1];
Indicator indicators[INDIC_MAX + 1];
+ int technology;
int lineHeight;
unsigned int maxAscent;
unsigned int maxDescent;