X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu_render.c;h=2ca1c77392af215ec9eb4163205e77f560242194;hb=d085756572ae13035f69ab6fd3f7c9556d155e9c;hp=a03f2caab526f78026e9513c02cc845450eb89c9;hpb=cd12a2eae5b5b72df08d588ac71d1f6cf6725dfb;p=chaz%2Fopenbox

diff --git a/openbox/menu_render.c b/openbox/menu_render.c
index a03f2caa..2ca1c773 100644
--- a/openbox/menu_render.c
+++ b/openbox/menu_render.c
@@ -29,9 +29,9 @@ void menu_render_full(Menu *self) {
     /* set texture data and size them mofos out */
     if (self->label) {
 	self->a_title->texture[0].data.text.string = self->label;
-	appearance_minsize(self->a_title, &self->title_min_w, &self->title_h);
-	self->title_min_w += theme_bevel * 2;
-	self->title_h += theme_bevel * 2;
+	RrMinsize(self->a_title, &self->title_min_w, &self->title_h);
+	self->title_min_w += ob_rr_theme->bevel * 2;
+	self->title_h += ob_rr_theme->bevel * 2;
 	self->size.width = MAX(self->size.width, self->title_min_w);
     }
 
@@ -40,40 +40,41 @@ void menu_render_full(Menu *self) {
         int h;
 
         e->a_item->texture[0].data.text.string = e->label;
-        appearance_minsize(e->a_item, &e->min_w, &self->item_h);
+        RrMinsize(e->a_item, &e->min_w, &self->item_h);
         self->size.width = MAX(self->size.width, e->min_w);
 
         e->a_disabled->texture[0].data.text.string = e->label;
-        appearance_minsize(e->a_disabled, &e->min_w, &h);
+        RrMinsize(e->a_disabled, &e->min_w, &h);
         self->item_h = MAX(self->item_h, h);
         self->size.width = MAX(self->size.width, e->min_w);
 	
         e->a_hilite->texture[0].data.text.string = e->label;
-        appearance_minsize(e->a_hilite, &e->min_w, &h);
+        RrMinsize(e->a_hilite, &e->min_w, &h);
         self->item_h = MAX(self->item_h, h);
         self->size.width = MAX(self->size.width, e->min_w);
 
-        e->min_w += theme_bevel * 2;
+        e->min_w += ob_rr_theme->bevel * 2;
         ++nitems;
     }
-    self->bullet_w = self->item_h + theme_bevel;
-    self->size.width += 2 * self->bullet_w + 2 * theme_bevel;
-    self->item_h += theme_bevel * 2;
+    self->bullet_w = self->item_h + ob_rr_theme->bevel;
+    self->size.width += 2 * self->bullet_w + 2 * ob_rr_theme->bevel;
+    self->item_h += ob_rr_theme->bevel * 2;
     items_h = self->item_h * MAX(nitems, 1);
 
     XResizeWindow(ob_display, self->frame, self->size.width,
 		  MAX(self->title_h + items_h, 1));
     if (self->label)
-	XMoveResizeWindow(ob_display, self->title, -theme_bwidth,
-			  -theme_bwidth, self->size.width, self->title_h);
+	XMoveResizeWindow(ob_display, self->title, -ob_rr_theme->bwidth,
+			  -ob_rr_theme->bwidth,
+                          self->size.width, self->title_h);
 
     XMoveResizeWindow(ob_display, self->items, 0, 
-		      self->title_h + theme_bwidth, self->size.width, 
+		      self->title_h + ob_rr_theme->bwidth, self->size.width, 
 		      items_h);
 
     if (self->label)
-	paint(self->title, self->a_title, self->size.width, self->title_h);
-    paint(self->items, self->a_items, self->size.width, items_h);
+	RrPaint(self->a_title, self->title, self->size.width, self->title_h);
+    RrPaint(self->a_items, self->items, self->size.width, items_h);
 
     item_y = 0;
     for (it = self->entries; it; it = it->next) {
@@ -89,7 +90,7 @@ void menu_render_full(Menu *self) {
 void menu_entry_render(MenuEntry *self)
 {
     Menu *menu = self->parent;
-    Appearance *a;
+    RrAppearance *a;
     
     switch (self->render_type) {
     case MenuEntryRenderType_Submenu:
@@ -123,5 +124,5 @@ void menu_entry_render(MenuEntry *self)
     a->surface.parentx = 0;
     a->surface.parenty = self->y;
 
-    paint(self->item, a, menu->size.width, menu->item_h);
+    RrPaint(a, self->item, menu->size.width, menu->item_h);
 }