Ignore:
Timestamp:
May 16, 2011, 2:37:31 AM (11 years ago)
Author:
Sam Hocevar
Message:

imlib: convert some Jwindow members to vec2i.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • abuse/trunk/src/imlib/jwindow.h

    r665 r671  
    9191public:
    9292    Jwindow *next;
    93     int l, h, backg;
     93    int backg;
    9494    InputManager *inm;
    9595    void *local_info;  // pointer to info block for local system (may support windows)
    9696
    9797    Jwindow(char const *name = NULL);
    98     Jwindow(vec2i pos, int L, int H, ifield *f, char const *name = NULL);
     98    Jwindow(vec2i pos, vec2i size, ifield *f, char const *name = NULL);
    9999    ~Jwindow();
    100100
    101101    virtual void redraw();
    102     void resize(int L, int H);
     102    void Resize(vec2i size);
    103103    void clear(int color = 0) { m_surf->Bar(vec2i(x1(), y1()),
    104104                                            vec2i(x2(), y2()), color); }
     
    114114    int y2() { return _y2; }
    115115    void clip_in() { m_surf->SetClip(vec2i(x1(), y1()), vec2i(x2() + 1, y2() + 1)); }
    116     void clip_out() { m_surf->SetClip(vec2i(0), vec2i(l, h)); }
     116    void clip_out() { m_surf->SetClip(vec2i(0), m_size); }
    117117    char *read(int id) { return inm->get(id)->read(); }
    118118    void local_close();
     
    123123    static int bottom_border();
    124124
    125     vec2i m_pos;
     125    vec2i m_pos, m_size;
    126126    image *m_surf;
    127127
     
    159159    JCFont *fnt, *wframe_fnt;
    160160
    161     Jwindow *new_window(int x, int y, int l, int h,
    162                         ifield *fields = NULL, char const *Name = NULL);
     161    Jwindow *CreateWindow(vec2i pos, vec2i size,
     162                          ifield *fields = NULL, char const *Name = NULL);
    163163
    164     void set_frame_font(JCFont *fnt) { wframe_fnt = fnt; }
    165164    JCFont *frame_font() { return wframe_fnt; }
    166165    void close_window(Jwindow *j);
     
    181180    void hide_window(Jwindow *j);
    182181    void show_window(Jwindow *j);
    183     void set_frame_suppress(int x) { frame_suppress=x; }
    184182    void grab_focus(Jwindow *j);
    185183    void release_focus();
    186     int window_in_area(int x1, int y1, int x2, int y2); // true if a window lies in this area
    187184
    188185private:
Note: See TracChangeset for help on using the changeset viewer.