themeupdate already fixes some recent changes

[chaz/openbox] / openbox / popup.c

diff --git a/openbox/popup.c b/openbox/popup.c
index cc4a605d42e419a320f962b9ff4144c8062e1f34..ac8ef700e99032cf953b03306e3d6b5ded43faa9 100644 (file)
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -97,7 +97,7 @@ void popup_size_to_string(Popup *self, gchar *text)
     gint iconw;
 
     if (!self->a_text)
-        self->a_text = RrAppearanceCopy(ob_rr_theme->app_hilite_label);
+        self->a_text = RrAppearanceCopy(ob_rr_theme->app_selected_label);
 
     self->a_text->texture[0].data.text.string = text;
     RrMinsize(self->a_text, &textw, &texth);
@@ -109,6 +109,14 @@ void popup_size_to_string(Popup *self, gchar *text)
     self->w = textw + iconw + ob_rr_theme->bevel * (self->hasicon ? 3 : 2);
 }
 
+void popup_set_text_align(Popup *self, RrJustify align)
+{
+    if (!self->a_text)
+        self->a_text = RrAppearanceCopy(ob_rr_theme->app_selected_label);
+
+    self->a_text->texture[0].data.text.justify = align;
+}
+
 void popup_show(Popup *self, gchar *text, ObClientIcon *icon)
 {
     gint x, y, w, h;
@@ -117,11 +125,11 @@ void popup_show(Popup *self, gchar *text, ObClientIcon *icon)
 
     /* create the shit if needed */
     if (!self->a_bg)
-        self->a_bg = RrAppearanceCopy(ob_rr_theme->app_hilite_bg);
+        self->a_bg = RrAppearanceCopy(ob_rr_theme->app_selected_bg);
     if (self->hasicon && !self->a_icon)
-        self->a_icon = RrAppearanceCopy(ob_rr_theme->app_icon);
+        self->a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex);
     if (!self->a_text)
-        self->a_text = RrAppearanceCopy(ob_rr_theme->app_hilite_label);
+        self->a_text = RrAppearanceCopy(ob_rr_theme->app_selected_label);
 
     XSetWindowBorderWidth(ob_display, self->bg, ob_rr_theme->bwidth);
     XSetWindowBorder(ob_display, self->bg, ob_rr_theme->b_color->pixel);