Changeset 655 for abuse/trunk/src/imlib/pmenu.cppTweet

Timestamp:

May 15, 2011, 6:22:08 AM (12 years ago)

Author:

Sam Hocevar

Message:

imlib: refactor a few image methods so that they use vec2i.

File:

• abuse/trunk/src/imlib/pmenu.cpp (modified) (5 diffs)

abuse/trunk/src/imlib/pmenu.cpp

@@ -37 +37 @@
   bar=wm->new_window(X, Y, w, 0, NULL);
   bar->freeze();  // can't drag this window
-  bar->m_surf->widget_bar(0,0,w-1,h-1,wm->bright_color(),wm->medium_color(),
-            wm->dark_color());
-
-
+  bar->m_surf->WidgetBar(vec2i(0, 0), vec2i(w - 1, h - 1),
+                         wm->bright_color(), wm->medium_color(),
+                         wm->dark_color());
 
   int total=0,tx,tw;
@@ -207 +206 @@
                      NULL);
   win->freeze();
-  win->m_surf->widget_bar(0,0,w-1,h-1,wm->bright_color(),wm->medium_color(),wm->dark_color());
+  win->m_surf->WidgetBar(vec2i(0, 0), vec2i(w - 1, h - 1),
+                         wm->bright_color(), wm->medium_color(),
+                         wm->dark_color());
 
   int has_flags=0;
@@ -228 +229 @@
   {
     int h=wm->font()->height();
-    parent->m_surf->widget_bar(x,y+h/2-1,x+w-1,y+h/2,wm->dark_color(),wm->medium_color(),wm->bright_color());
+    parent->m_surf->WidgetBar(vec2i(x, y + h / 2 - 1),
+                              vec2i(x + w - 1, y + h / 2), wm->dark_color(),
+                              wm->medium_color(), wm->bright_color());
   } else
   {
@@ -237 +240 @@
       else
       {
-    parent->m_surf->bar(bx,y,x+w-1,y+wm->font()->height()+1,wm->dark_color());
+    parent->m_surf->Bar(vec2i(bx, y),
+                        vec2i(x + w - 1, y + wm->font()->height() + 1),
+                        wm->dark_color());
     wm->font()->put_string(parent->m_surf,x+1,y+1,n,wm->medium_color());
     if (on_off && *on_off) wm->font()->put_string(parent->m_surf,bx+1,y+1,"*",wm->medium_color());
@@ -247 +252 @@
       else
       {
-    parent->m_surf->bar(bx,y,x+w-1,y+wm->font()->height()+1,wm->medium_color());
+    parent->m_surf->Bar(vec2i(bx, y),
+                        vec2i(x + w - 1, y + wm->font()->height() + 1),
+                        wm->medium_color());
     wm->font()->put_string(parent->m_surf,x+1,y+1,n,wm->bright_color());
     if (on_off && *on_off) wm->font()->put_string(parent->m_surf,bx+1,y+1,"*",wm->bright_color());