| … | |
… | |
| 812 | delete fontset[0]; |
812 | delete fontset[0]; |
| 813 | fontset[0] = fs; |
813 | fontset[0] = fs; |
| 814 | |
814 | |
| 815 | prop = (*fs)[1]->properties (); |
815 | prop = (*fs)[1]->properties (); |
| 816 | prop.height += lineSpace; |
816 | prop.height += lineSpace; |
|
|
817 | |
| 817 | fs->set_prop (prop); |
818 | fs->set_prop (prop, false); |
| 818 | |
819 | |
| 819 | fwidth = prop.width; |
820 | fwidth = prop.width; |
| 820 | fheight = prop.height; |
821 | fheight = prop.height; |
| 821 | fbase = prop.ascent; |
822 | fbase = prop.ascent; |
| 822 | |
823 | |
| … | |
… | |
| 841 | if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; |
842 | if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; |
| 842 | if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; |
843 | if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; |
| 843 | } |
844 | } |
| 844 | |
845 | |
| 845 | fs->populate (res); |
846 | fs->populate (res); |
| 846 | fs->set_prop (prop2); |
847 | fs->set_prop (prop2, true); |
| 847 | } |
848 | } |
| 848 | #else |
849 | #else |
| 849 | fontset[style] = fontset[0]; |
850 | fontset[style] = fontset[0]; |
| 850 | #endif |
851 | #endif |
| 851 | } |
852 | } |
