Fixing the calculation of the base tty pixel size.

master
Christoph Lohmann 2012-11-21 20:38:15 +01:00
parent cf04354e06
commit b26df1d0d3
1 changed files with 8 additions and 8 deletions

16
st.c
View File

@ -2182,8 +2182,8 @@ tresize(int col, int row) {
void void
xresize(int col, int row) { xresize(int col, int row) {
xw.tw = MAX(1, 2*borderpx + col * xw.cw); xw.tw = MAX(1, col * xw.cw);
xw.th = MAX(1, 2*borderpx + row * xw.ch); xw.th = MAX(1, row * xw.ch);
XftDrawChange(xw.draw, xw.buf); XftDrawChange(xw.draw, xw.buf);
} }
@ -2259,8 +2259,8 @@ xhints(void) {
sizeh->width = xw.w; sizeh->width = xw.w;
sizeh->height_inc = xw.ch; sizeh->height_inc = xw.ch;
sizeh->width_inc = xw.cw; sizeh->width_inc = xw.cw;
sizeh->base_height = 2*borderpx; sizeh->base_height = 2 * borderpx;
sizeh->base_width = 2*borderpx; sizeh->base_width = 2 * borderpx;
} else { } else {
sizeh->flags = PMaxSize | PMinSize; sizeh->flags = PMaxSize | PMinSize;
sizeh->min_width = sizeh->max_width = xw.fw; sizeh->min_width = sizeh->max_width = xw.fw;
@ -2393,8 +2393,8 @@ xinit(void) {
xw.w = xw.fw; xw.w = xw.fw;
} else { } else {
/* window - default size */ /* window - default size */
xw.h = 2*borderpx + term.row * xw.ch; xw.h = 2 * borderpx + term.row * xw.ch;
xw.w = 2*borderpx + term.col * xw.cw; xw.w = 2 * borderpx + term.col * xw.cw;
xw.fx = 0; xw.fx = 0;
xw.fy = 0; xw.fy = 0;
} }
@ -2818,8 +2818,8 @@ cresize(int width, int height)
if(height != 0) if(height != 0)
xw.h = height; xw.h = height;
col = (xw.w - 2*borderpx) / xw.cw; col = (xw.w - 2 * borderpx) / xw.cw;
row = (xw.h - 2*borderpx) / xw.ch; row = (xw.h - 2 * borderpx) / xw.ch;
tresize(col, row); tresize(col, row);
xresize(col, row); xresize(col, row);