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/pmenu.cpp

    r668 r671  
    3535  int h = Jwindow::top_border() + Jwindow::bottom_border();
    3636
    37   bar=wm->new_window(X, Y, w, 0, NULL);
     37  bar = wm->CreateWindow(vec2i(X, Y), vec2i(w, 0), NULL);
    3838  bar->freeze();  // can't drag this window
    3939  bar->m_surf->WidgetBar(vec2i(0, 0), vec2i(w - 1, h - 1),
     
    195195  if (h+y+parent->m_pos.y>=cbb.y)
    196196  {
    197     if (parent->m_pos.y+parent->h+wm->font()->Size().y>=cbb.y)
     197    if (parent->m_pos.y+parent->m_size.y+wm->font()->Size().y>=cbb.y)
    198198      y=-h;
    199199    else y=y-h+wm->font()->Size().y+5;
     
    201201
    202202
    203   win=wm->new_window(parent->m_pos.x+x,parent->m_pos.y+y,
    204              w - Jwindow::left_border() - Jwindow::right_border(),
    205              h - Jwindow::top_border() - Jwindow::bottom_border(),
    206                      NULL);
     203  win=wm->CreateWindow(parent->m_pos + vec2i(x, y),
     204             vec2i(w - Jwindow::left_border() - Jwindow::right_border(),
     205                   h - Jwindow::top_border() - Jwindow::bottom_border()),
     206             NULL);
    207207  win->freeze();
    208208  win->m_surf->WidgetBar(vec2i(0, 0), vec2i(w - 1, h - 1),
Note: See TracChangeset for help on using the changeset viewer.