X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fpopup.c;h=90ec32deb959d1183cb1d0aaa08c1542bc82ec12;hb=7aae8cc5262c1b36e3196845d62489b76af9063f;hp=47d0d0fbca86bdda1f38ff265c5ed36fa0413229;hpb=50d662681160c309ea86268c0d05794b87b75593;p=chaz%2Fopenbox diff --git a/openbox/popup.c b/openbox/popup.c index 47d0d0fb..90ec32de 100644 --- a/openbox/popup.c +++ b/openbox/popup.c @@ -25,8 +25,8 @@ #include "stacking.h" #include "event.h" #include "screen.h" -#include "render/render.h" -#include "render/theme.h" +#include "obrender/render.h" +#include "obrender/theme.h" ObPopup *popup_new(void) { @@ -36,7 +36,7 @@ ObPopup *popup_new(void) self->obwin.type = OB_WINDOW_CLASS_INTERNAL; self->gravity = NorthWestGravity; self->x = self->y = self->textw = self->h = 0; - self->a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg); + self->a_bg = RrAppearanceCopy(ob_rr_theme->osd_bg); self->a_text = RrAppearanceCopy(ob_rr_theme->osd_hilite_label); self->iconwm = self->iconhm = 1; @@ -506,8 +506,8 @@ ObPagerPopup *pager_popup_new(void) self->desks = 0; self->wins = g_new(Window, self->desks); - self->hilight = RrAppearanceCopy(ob_rr_theme->osd_hilite_fg); - self->unhilight = RrAppearanceCopy(ob_rr_theme->osd_unhilite_fg); + self->hilight = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg); + self->unhilight = RrAppearanceCopy(ob_rr_theme->osd_unhilite_bg); self->popup->hasicon = TRUE; self->popup->draw_icon = pager_popup_draw_icon;