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

imlib: rename Jwindow's x and y members to m_pos.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • abuse/trunk/src/gui.cpp

    r655 r659  
    2727ico_switch_button::ico_switch_button(int X, int Y, int ID, int start_on, ifield *butts, ifield *Next)
    2828{
    29   x=X; y=Y; id=ID;
     29  m_pos = vec2i(X, Y); id=ID;
    3030  next=Next;
    3131  blist=cur_but=butts;
    3232  act=0;
    33   for (ifield *b=blist; b; b=b->next) { b->x=x; b->y=y; }
     33  for (ifield *b=blist; b; b=b->next)
     34      b->m_pos = m_pos;
    3435  while (cur_but && start_on--) cur_but=cur_but->next;
    3536  if (!cur_but) cur_but=blist;
     
    5152    if (Y2>y2) y2=Y2;
    5253  }
    53   if (!blist) { x1=x2=x; y1=y2=y; }
     54  if (!blist) { x1=x2=m_pos.x; y1=y2=m_pos.y; }
    5455}
    5556
     
    135136void ico_button::area(int &x1, int &y1, int &x2, int &y2)
    136137{
    137   x1=x; y1=y;
    138   x2=x+cache.img(u)->Size().x-1;
    139   y2=y+cache.img(u)->Size().y-1;
     138  x1=m_pos.x; y1=m_pos.y;
     139  x2=m_pos.x+cache.img(u)->Size().x-1;
     140  y2=m_pos.y+cache.img(u)->Size().y-1;
    140141}
    141142
     
    150151
    151152  up=1;
    152   x=X; y=Y; id=ID;
     153  m_pos = vec2i(X, Y); id=ID;
    153154  u=Up; d=down;
    154155  ua=upa; da=downa;
Note: See TracChangeset for help on using the changeset viewer.