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/imlib/input.h

    r655 r659  
    4949  void press_button(int id);      // if button box doesn't contain id, nothing happens
    5050  virtual void remap(Filter *f);
    51   virtual void move(int newx, int newy);
     51  virtual void Move(vec2i pos);
    5252  virtual void area(int &x1, int &y1, int &x2, int &y2);
    5353  virtual void draw_first(image *screen);
     
    6565  int cur;
    6666  char *prompt,*data,*format;
    67   int xstart() { return x+wm->font()->width()*(strlen(prompt)+1)+3; }
    68   int xend() { return x+wm->font()->width()*(strlen(prompt)+1+strlen(format))+7; }
    69   int yend() { return y+wm->font()->height()+5; }
     67  int xstart() { return m_pos.x+wm->font()->width()*(strlen(prompt)+1)+3; }
     68  int xend() { return m_pos.x+wm->font()->width()*(strlen(prompt)+1+strlen(format))+7; }
     69  int yend() { return m_pos.y+wm->font()->height()+5; }
    7070  void draw_cur(int color, image *screen);
    7171  int last_spot() { int x=strlen(data); while (x && data[x-1]==' ') x--; return x; }
    7272  void draw_text(image *screen)
    7373  {
    74     screen->Bar(vec2i(xstart() + 1, y + 1), vec2i(xend() - 1, yend() - 1),
     74    screen->Bar(vec2i(xstart() + 1, m_pos.y + 1), vec2i(xend() - 1, yend() - 1),
    7575                wm->dark_color());
    76     wm->font()->put_string(screen,xstart()+1,y+3,data);
     76    wm->font()->put_string(screen,xstart()+1,m_pos.y+3,data);
    7777  }
    7878public :
Note: See TracChangeset for help on using the changeset viewer.