← Back to branch summary

~ubuntu-branches/ubuntu/natty/geany/natty

« back to all changes in this revision

Viewing changes to scintilla/Style.cxx

  • Committer: Bazaar Package Importer
  • Author(s): Chow Loong Jin
  • Date: 2010-08-07 03:23:12 UTC
  • mfrom: (1.4.3 upstream)
  • mto: This revision was merged to the branch mainline in revision 22.
  • Revision ID: james.westby@ubuntu.com-20100807032312-ot70ac9d50cn79we
Tags: upstream-0.19
Import upstream version 0.19

Show diffs side-by-side

added added

removed removed

Lines of Context:
scintilla/Style.cxx
92
92
        else
93
93
                font.Release();
94
94
        aliasOfDefaultFont = false;
 
95
        sizeZoomed = 2;
 
96
        lineHeight = 2;
 
97
        ascent = 1;
 
98
        descent = 1;
 
99
        externalLeading = 0;
 
100
        aveCharWidth = 1;
 
101
        spaceWidth = 1;
95
102
}
96
103
 
97
104
void Style::ClearTo(const Style &source) {
126
133
        return strcmp(fontName, other->fontName) == 0;
127
134
}
128
135
 
129
 
void Style::Realise(Surface &surface, int zoomLevel, Style *defaultStyle, bool extraFontFlag) {
 
136
void Style::Realise(Surface &surface, int zoomLevel, Style *defaultStyle, int extraFontFlag) {
130
137
        sizeZoomed = size + zoomLevel;
131
138
        if (sizeZoomed <= 2)    // Hangs if sizeZoomed <= 1
132
139
                sizeZoomed = 2;