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

rendering fixups for submenu bullets

Browse source
This commit is contained in:
Dana Jansens 2003-08-12 10:05:36 +00:00
parent 5fe1eb45c7
commit b1d44ac43b
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
openbox/menu_render.c
View file

@ -126,16 +126,25 @@ void menu_entry_render(ObMenuEntry *self)
XMoveResizeWindow(ob_display, self->item, 0, self->y,
menu->size.width, menu->item_h);
XMoveResizeWindow(ob_display, self->submenu_pic, menu->size.width - ob_rr_theme->bevel - 1, self->y,
8, 8);
if (s) {
XMoveResizeWindow(ob_display, self->submenu_pic,
menu->size.width -
menu->bullet_w + (menu->bullet_w - 8) / 2,
self->y + (menu->item_h - 8) / 2,
8, 8);
XMapWindow(ob_display, self->submenu_pic);
} else
XUnmapWindow(ob_display, self->submenu_pic);
a->surface.parent = menu->a_items;
a->surface.parentx = 0;
a->surface.parenty = self->y;
if (s) {
s->surface.parent = a;
s->surface.parentx = menu->size.width - 8;
s->surface.parenty = 0;
s->surface.parentx = menu->size.width -
menu->bullet_w + (menu->bullet_w - 8) / 2,
s->surface.parenty = (menu->item_h - 8) / 2;
}
RrPaint(a, self->item, menu->size.width, menu->item_h);

12
render/theme.c
View file

@ -245,7 +245,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
theme->menu_color = RrColorNew(inst, 0xff, 0xff, 0xff);
if (!read_color(db, inst,
"menu.bullet.picColor", &theme->menu_color))
theme->menu_bullet_color = RrColorNew(inst, 0x00, 0x00, 0x00);
theme->menu_bullet_color = RrColorNew(inst, 0, 0, 0);
if (!read_color(db, inst,
"menu.frame.disableColor", &theme->menu_disabled_color))
theme->menu_disabled_color = RrColorNew(inst, 0, 0, 0);
@ -398,10 +398,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
}
if (!read_mask(inst, "bullet.xbm", theme, &theme->menu_bullet_mask)) {
unsigned char data[] =
{ 0x18, 0x30, 0x60, 0xfe, 0xfe, 0x60, 0x30, 0x18 };
theme->menu_bullet_mask = RrPixmapMaskNew(inst, 8, 8,
(gchar *)data);
char data[] = { 0x18, 0x30, 0x60, 0xfe, 0xfe, 0x60, 0x30, 0x18 };
theme->menu_bullet_mask = RrPixmapMaskNew(inst, 8, 8, data);
}
/* read the decoration textures */
@ -765,6 +763,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
theme->a_focused_unpressed_iconify->texture[0].data.mask.mask =
theme->a_unfocused_unpressed_iconify->texture[0].data.mask.mask =
theme->iconify_mask;
theme->a_menu_bullet->texture[0].data.mask.mask =
theme->menu_bullet_mask;
theme->a_disabled_focused_max->texture[0].data.mask.color =
theme->a_disabled_focused_close->texture[0].data.mask.color =
theme->a_disabled_focused_desk->texture[0].data.mask.color =
@ -821,6 +821,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
theme->a_unfocused_pressed_shade->texture[0].data.mask.color =
theme->a_unfocused_pressed_iconify->texture[0].data.mask.color =
theme->titlebut_unfocused_pressed_color;
theme->a_menu_bullet->texture[0].data.mask.color =
theme->menu_bullet_color;
XrmDestroyDatabase(db);