Ignore:
Timestamp:
May 15, 2011, 6:22:08 AM (11 years ago)
Author:
Sam Hocevar
Message:

imlib: refactor a few image methods so that they use vec2i.

File:
1 edited

Legend:

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

    r644 r655  
    3737  bar=wm->new_window(X, Y, w, 0, NULL);
    3838  bar->freeze();  // can't drag this window
    39   bar->m_surf->widget_bar(0,0,w-1,h-1,wm->bright_color(),wm->medium_color(),
    40             wm->dark_color());
    41 
    42 
     39  bar->m_surf->WidgetBar(vec2i(0, 0), vec2i(w - 1, h - 1),
     40                         wm->bright_color(), wm->medium_color(),
     41                         wm->dark_color());
    4342
    4443  int total=0,tx,tw;
     
    207206                     NULL);
    208207  win->freeze();
    209   win->m_surf->widget_bar(0,0,w-1,h-1,wm->bright_color(),wm->medium_color(),wm->dark_color());
     208  win->m_surf->WidgetBar(vec2i(0, 0), vec2i(w - 1, h - 1),
     209                         wm->bright_color(), wm->medium_color(),
     210                         wm->dark_color());
    210211
    211212  int has_flags=0;
     
    228229  {
    229230    int h=wm->font()->height();
    230     parent->m_surf->widget_bar(x,y+h/2-1,x+w-1,y+h/2,wm->dark_color(),wm->medium_color(),wm->bright_color());
     231    parent->m_surf->WidgetBar(vec2i(x, y + h / 2 - 1),
     232                              vec2i(x + w - 1, y + h / 2), wm->dark_color(),
     233                              wm->medium_color(), wm->bright_color());
    231234  } else
    232235  {
     
    237240      else
    238241      {
    239     parent->m_surf->bar(bx,y,x+w-1,y+wm->font()->height()+1,wm->dark_color());
     242    parent->m_surf->Bar(vec2i(bx, y),
     243                        vec2i(x + w - 1, y + wm->font()->height() + 1),
     244                        wm->dark_color());
    240245    wm->font()->put_string(parent->m_surf,x+1,y+1,n,wm->medium_color());
    241246    if (on_off && *on_off) wm->font()->put_string(parent->m_surf,bx+1,y+1,"*",wm->medium_color());
     
    247252      else
    248253      {
    249     parent->m_surf->bar(bx,y,x+w-1,y+wm->font()->height()+1,wm->medium_color());
     254    parent->m_surf->Bar(vec2i(bx, y),
     255                        vec2i(x + w - 1, y + wm->font()->height() + 1),
     256                        wm->medium_color());
    250257    wm->font()->put_string(parent->m_surf,x+1,y+1,n,wm->bright_color());
    251258    if (on_off && *on_off) wm->font()->put_string(parent->m_surf,bx+1,y+1,"*",wm->bright_color());
Note: See TracChangeset for help on using the changeset viewer.