Ignore:
Timestamp:
May 16, 2011, 2:37:19 AM (12 years ago)
Author:
Sam Hocevar
Message:

imlib: make JCFont use vec2i classes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • abuse/trunk/src/imlib/guistat.cpp

    r659 r668  
    5757{
    5858    long l = whom->stat_win->x2() - whom->stat_win->x1() - 6;
    59     long h = wm->font()->height();
     59    long h = wm->font()->Size().y;
    6060
    6161    whom->stat_win->m_surf->Bar(vec2i(whom->stat_win->x1() + 1,
     
    9999      if (now.diff_time(&first->last_time)>1)
    100100      {
    101     long wx=xres/2,wy=10,len1=strlen(first->name)*wm->font()->width()+10,len2=0,len3,
    102       h1=wm->font()->height()+5,h2=first->show ? first->show->height() : 0;
     101    long wx=xres/2,wy=10,len1=strlen(first->name)*wm->font()->Size().x+10,len2=0,len3,
     102      h1=wm->font()->Size().y+5,h2=first->show ? first->show->height() : 0;
    103103
    104104    if (first->show) len2=first->show->width()/2;
     
    112112
    113113    int mx = first->stat_win->x1() + 1;
    114     int my = first->stat_win->y1() + wm->font()->height() / 2;
     114    int my = first->stat_win->y1() + wm->font()->Size().y / 2;
    115115    first->stat_win=wm->new_window(wx, wy, len3, h1*2+h2, NULL, "status");
    116     wm->font()->put_string(first->stat_win->m_surf, mx, my, first->name, wm->black());
    117     wm->font()->put_string(first->stat_win->m_surf, mx, my, first->name, wm->bright_color());
     116    wm->font()->PutString(first->stat_win->m_surf, vec2i(mx, my), first->name, wm->black());
     117    wm->font()->PutString(first->stat_win->m_surf, vec2i(mx, my), first->name, wm->bright_color());
    118118    if (first->show)
    119119      first->show->draw(first->stat_win->m_surf, (first->stat_win->x2()-first->stat_win->x1())/2-
Note: See TracChangeset for help on using the changeset viewer.