Changeset 659 for abuse/trunk/src/imlib/pmenu.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/imlib/pmenu.cpp (modified) (6 diffs)

abuse/trunk/src/imlib/pmenu.cpp

@@ -191 +191 @@
   int cx1, cy1, cx2, cy2;
   main_screen->GetClip(cx1, cy1, cx2, cy2);
-  if (parent->x+w+x>=cx2)
-    x=cx2-1-w-parent->x;
-  if (h+y+parent->y>=cy2)
-  {
-    if (parent->y+parent->h+wm->font()->height()>=cy2)
+  if (parent->m_pos.x + w + x >= cx2)
+    x=cx2-1-w-parent->m_pos.x;
+  if (h+y+parent->m_pos.y>=cy2)
+  {
+    if (parent->m_pos.y+parent->h+wm->font()->height()>=cy2)
       y=-h;
     else y=y-h+wm->font()->height()+5;
@@ -201 +201 @@
 
 
-  win=wm->new_window(parent->x+x,parent->y+y,
+  win=wm->new_window(parent->m_pos.x+x,parent->m_pos.y+y,
              w - Jwindow::left_border() - Jwindow::right_border(),
              h - Jwindow::top_border() - Jwindow::bottom_border(),
@@ -325 +325 @@
   main_screen->GetClip(cx1, cy1, cx2, cy2);
 
-  x=win->x;
-  y=win->y;
+  x=win->m_pos.x;
+  y=win->m_pos.y;
 
   int has_flags=0,dx=3;
@@ -353 +353 @@
     } else return 1;
   } else if (active!=-1)
-    return item_num(active)->handle_event(win,win->x+dx,win->y+3+active*(th+1),w-6,0,ev);
+    return item_num(active)->handle_event(win,win->m_pos.x+dx,win->m_pos.y+3+active*(th+1),w-6,0,ev);
   else return 0;
 
@@ -362 +362 @@
                  Event &ev)
 {
-  x+=parent->x;
-  y+=parent->y;
+  x+=parent->m_pos.x;
+  y+=parent->m_pos.y;
   if (ev.mouse_move.x>=x && ev.mouse_move.y>=y && ev.mouse_move.x<x+w &&
       ev.mouse_move.y<y+wm->font()->height()+2)
@@ -386 +386 @@
   int cx1, cy1, cx2, cy2;
   screen->GetClip(cx1, cy1, cx2, cy2);
-  mx-=bar->x;
-  my-=bar->y;
+  mx-=bar->m_pos.x;
+  my-=bar->m_pos.y;
   if (mx<0 || my<0 || mx>=bar->m_surf->Size().x || my>=bar->m_surf->Size().y) return NULL;
   else