nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes for resizing to strings.

Browse source
This commit is contained in:
Dana Jansens 2007-05-06 06:42:06 +00:00
parent 3d54ac170c
commit d4fec1d336
2 changed files with 23 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
openbox/popup.c
View file

@ -91,6 +91,7 @@ void popup_position(ObPopup *self, gint gravity, gint x, gint y)
void popup_width(ObPopup *self, gint w)
{
self->w = w;
self->maxw = w;
}
void popup_height(ObPopup *self, gint h)
@ -104,19 +105,9 @@ void popup_height(ObPopup *self, gint h)
void popup_width_to_string(ObPopup *self, gchar *text, gint max)
{
gint textw, iconw;
self->a_text->texture[0].data.text.string = text;
textw = RrMinWidth(self->a_text);
if (self->hasicon) {
gint texth = RrMinHeight(self->a_text) + ob_rr_theme->paddingy * 2;
iconw = texth;
} else
iconw = 0;
self->w = textw + iconw + ob_rr_theme->paddingx * (self->hasicon ? 3 : 2);
/* cap it at "max" */
if (max > 0)
self->w = MIN(self->w, max);
self->w = RrMinWidth(self->a_text);
self->maxw = max;
}
void popup_height_to_string(ObPopup *self, gchar *text)
@ -124,12 +115,12 @@ void popup_height_to_string(ObPopup *self, gchar *text)
self->h = RrMinHeight(self->a_text) + ob_rr_theme->paddingy * 2;
}
void popup_width_to_strings(ObPopup *self, gchar **strings, gint max)
void popup_width_to_strings(ObPopup *self, gchar **strings, gint num, gint max)
{
gint i, maxw;
maxw = 0;
for (i = 0; strings[i] != NULL; ++i) {
for (i = 0; i < num; ++i) {
popup_width_to_string(self, strings[i], max);
maxw = MAX(maxw, self->w);
}
@ -174,13 +165,13 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
} else
h = t+b + texth + ob_rr_theme->paddingy * 2;
iconw = (self->hasicon ? texth : 0);
if (self->w) {
w = self->w;
textw = w - (l+r + iconw + ob_rr_theme->paddingx *
(self->hasicon ? 3 : 2));
} else
w = l+r + textw + iconw + ob_rr_theme->paddingx *
(self->hasicon ? 3 : 2);
if (self->w)
textw = self->w;
w = l+r + textw + iconw + ob_rr_theme->paddingx *
(self->hasicon ? 3 : 2);
/* cap it at "maxw" */
w = MIN(w, self->maxw);
/* sanity checks to avoid crashes! */
if (w < 1) w = 1;
if (h < 1) h = 1;
@ -452,6 +443,7 @@ ObPagerPopup *pager_popup_new()
self->hilight = RrAppearanceCopy(ob_rr_theme->osd_hilite_fg);
self->unhilight = RrAppearanceCopy(ob_rr_theme->osd_unhilite_fg);
self->popup->hasicon = TRUE;
self->popup->draw_icon = pager_popup_draw_icon;
self->popup->draw_icon_data = self;

19
openbox/popup.h
View file

@ -47,6 +47,7 @@ struct _ObPopup
gint y;
gint w;
gint h;
gint maxw;
gboolean mapped;
gboolean delay_mapped;
@ -88,7 +89,7 @@ void popup_width(ObPopup *self, gint w);
void popup_height(ObPopup *self, gint w);
void popup_width_to_string(ObPopup *self, gchar *text, gint max);
void popup_height_to_string(ObPopup *self, gchar *text);
void popup_width_to_strings(ObPopup *self, gchar **strings, gint max);
void popup_width_to_strings(ObPopup *self, gchar **strings, gint num,gint max);
void popup_set_text_align(ObPopup *self, RrJustify align);
@ -109,10 +110,10 @@ void icon_popup_delay_show(ObIconPopup *self, gulong usec,
#define icon_popup_position(p, g, x, y) popup_position((p)->popup,(g),(x),(y))
#define icon_popup_width(p, w) popup_width((p)->popup,(w))
#define icon_popup_height(p, h) popup_height((p)->popup,(h))
#define icon_popup_width_to_string(p, s, m) \
popup_width_to_string((p)->popup,(s),(m))
#define icon_popup_width_to_strings(p, s, m) \
popup_width_to_strings((p)->popup,(s),(m))
#define icon_popup_width_to_string(p, s, n, m) \
popup_width_to_string((p)->popup,(s),(n),(m))
#define icon_popup_width_to_strings(p, s, n, m) \
popup_width_to_strings((p)->popup,(s),(n),(m))
#define icon_popup_set_text_align(p, j) popup_set_text_align((p)->popup,(j))
ObPagerPopup *pager_popup_new();
@ -125,10 +126,10 @@ void pager_popup_delay_show(ObPagerPopup *self, gulong usec,
#define pager_popup_position(p, g, x, y) popup_position((p)->popup,(g),(x),(y))
#define pager_popup_width(p, w) popup_width((p)->popup,(w))
#define pager_popup_height(p, h) popup_height((p)->popup,(h))
#define pager_popup_width_to_string(p, s, m) \
popup_width_to_string((p)->popup,(s),(m))
#define pager_popup_width_to_strings(p, s, m) \
popup_width_to_strings((p)->popup,(s),(m))
#define pager_popup_width_to_string(p, s, n, m) \
popup_width_to_string((p)->popup,(s),(n),(m))
#define pager_popup_width_to_strings(p, s, n, m) \
popup_width_to_strings((p)->popup,(s),(n),(m))
#define pager_popup_set_text_align(p, j) popup_set_text_align((p)->popup,(j))
#endif