Changeset 659 for abuse/trunk/src/gui.cppTweet

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:

• abuse/trunk/src/gui.cpp (modified) (4 diffs)

abuse/trunk/src/gui.cpp

@@ -27 +27 @@
 ico_switch_button::ico_switch_button(int X, int Y, int ID, int start_on, ifield *butts, ifield *Next)
 {
-  x=X; y=Y; id=ID;
+  m_pos = vec2i(X, Y); id=ID;
   next=Next;
   blist=cur_but=butts;
   act=0;
-  for (ifield *b=blist; b; b=b->next) { b->x=x; b->y=y; }
+  for (ifield *b=blist; b; b=b->next)
+      b->m_pos = m_pos;
   while (cur_but && start_on--) cur_but=cur_but->next;
   if (!cur_but) cur_but=blist;
@@ -51 +52 @@
     if (Y2>y2) y2=Y2;
   }
-  if (!blist) { x1=x2=x; y1=y2=y; }
+  if (!blist) { x1=x2=m_pos.x; y1=y2=m_pos.y; }
 }
 
@@ -135 +136 @@
 void ico_button::area(int &x1, int &y1, int &x2, int &y2)
 {
-  x1=x; y1=y;
-  x2=x+cache.img(u)->Size().x-1;
-  y2=y+cache.img(u)->Size().y-1;
+  x1=m_pos.x; y1=m_pos.y;
+  x2=m_pos.x+cache.img(u)->Size().x-1;
+  y2=m_pos.y+cache.img(u)->Size().y-1;
 }
 
@@ -150 +151 @@
 
   up=1;
-  x=X; y=Y; id=ID;
+  m_pos = vec2i(X, Y); id=ID;
   u=Up; d=down;
   ua=upa; da=downa;