Subversion Repositories wimsdev

Rev

Rev 8195 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 8195 Rev 11121
Line 152... Line 152...
152
    dvix=rint(dviratio*d_h); dviy=rint(dviratio*d_v);
152
    dvix=rint(dviratio*d_h); dviy=rint(dviratio*d_v);
153
    if(pass==1) {
153
    if(pass==1) {
154
        ct=cc-wfont[d_f].bc;
154
        ct=cc-wfont[d_f].bc;
155
        x1=dvix+wfont[d_f].fh[ct].xstart; y1=dviy+wfont[d_f].fh[ct].ystart;
155
        x1=dvix+wfont[d_f].fh[ct].xstart; y1=dviy+wfont[d_f].fh[ct].ystart;
156
        x2=x1+wfont[d_f].fh[ct].xmax; y2=y1+wfont[d_f].fh[ct].ymax;
156
        x2=x1+wfont[d_f].fh[ct].xmax; y2=y1+wfont[d_f].fh[ct].ymax;
-
 
157
        if(minx>x1) minx=x1;
157
        if(minx>x1) minx=x1; if(miny>y1) miny=y1;
158
        if(miny>y1) miny=y1;
158
        if(maxx<x2) maxx=x2; if(maxy<y2) maxy=y2;
159
        if(maxx<x2) maxx=x2;
-
 
160
        if(maxy<y2) maxy=y2;
159
    }
161
    }
160
    else {
162
    else {
161
        paintfont(wfont+d_f,cc,dvix-minx,dviy-miny,currentcolor);
163
        paintfont(wfont+d_f,cc,dvix-minx,dviy-miny,currentcolor);
162
    }
164
    }
163
    return cc;
165
    return cc;
Line 184... Line 186...
184
    if(pass==1) {
186
    if(pass==1) {
185
        x1=rint(dviratio*d_h); y2=rint(dviratio*d_v);
187
        x1=rint(dviratio*d_h); y2=rint(dviratio*d_v);
186
        x2=x1+xx; y1=y2-yy;
188
        x2=x1+xx; y1=y2-yy;
187
        if(x1<x2) {xx1=x1; xx2=x2;} else {xx1=x2; xx2=x1;}
189
        if(x1<x2) {xx1=x1; xx2=x2;} else {xx1=x2; xx2=x1;}
188
        if(y1<y2) {yy1=y1; yy2=y2;} else {yy1=y2; yy2=y1;}
190
        if(y1<y2) {yy1=y1; yy2=y2;} else {yy1=y2; yy2=y1;}
-
 
191
        if(minx>x1) minx=x1;
189
        if(minx>x1) minx=x1; if(miny>y1) miny=y1;
192
        if(miny>y1) miny=y1;
190
        if(maxx<x2) maxx=x2; if(maxy<y2) maxy=y2;
193
        if(maxx<x2) maxx=x2;
-
 
194
        if(maxy<y2) maxy=y2;
191
    }
195
    }
192
    else {
196
    else {
193
        x1=rint(dviratio*d_h)-minx; y1=rint(dviratio*d_v)-miny;
197
        x1=rint(dviratio*d_h)-minx; y1=rint(dviratio*d_v)-miny;
194
        x2=x1+xx; y2=y1-yy;
198
        x2=x1+xx; y2=y1-yy;
195
        if(x1<x2) {xx1=x1; xx2=x2;} else {xx1=x2; xx2=x1;}
199
        if(x1<x2) {xx1=x1; xx2=x2;} else {xx1=x2; xx2=x1;}