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

Fixed DrawString

Browse source
This commit is contained in:
fluxgen 2001-12-13 20:54:21 +00:00
parent d88da3657c
commit a66c92b9f5
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Basemenu.cc
View file

@ -197,8 +197,8 @@ Basemenu::~Basemenu(void) {
int Basemenu::insert(const char *l, int function, const char *e, int pos) { int Basemenu::insert(const char *l, int function, const char *e, int pos) {
char *label = 0, *exec = 0; char *label = 0, *exec = 0;
if (l) label = bstrdup(l); if (l) label = Misc::strdup(l);
if (e) exec = bstrdup(e); if (e) exec = Misc::strdup(e);
BasemenuItem *item = new BasemenuItem(label, function, exec); BasemenuItem *item = new BasemenuItem(label, function, exec);
menuitems->insert(item, pos); menuitems->insert(item, pos);
@ -210,7 +210,7 @@ int Basemenu::insert(const char *l, int function, const char *e, int pos) {
int Basemenu::insert(const char *l, Basemenu *submenu, int pos) { int Basemenu::insert(const char *l, Basemenu *submenu, int pos) {
char *label = 0; char *label = 0;
if (l) label = bstrdup(l); if (l) label = Misc::strdup(l);
BasemenuItem *item = new BasemenuItem(label, submenu); BasemenuItem *item = new BasemenuItem(label, submenu);
menuitems->insert(item, pos); menuitems->insert(item, pos);
@ -507,11 +507,11 @@ void Basemenu::redrawTitle(void) {
l += (menu.bevel_w * 2); l += (menu.bevel_w * 2);
switch (screen->getMenuStyle()->titlefont.justify) { switch (screen->getMenuStyle()->titlefont.justify) {
case FFont::Right: case Misc::Font::RIGHT:
dx += menu.width - l; dx += menu.width - l;
break; break;
case FFont::Center: case Misc::Font::CENTER:
dx += (menu.width - l) / 2; dx += (menu.width - l) / 2;
break; break;
default: default:
@ -644,11 +644,11 @@ void Basemenu::drawItem(int index, Bool highlight, Bool clear,
} }
switch(screen->getMenuStyle()->framefont.justify) { switch(screen->getMenuStyle()->framefont.justify) {
case FFont::Left: case Misc::Font::LEFT:
text_x = item_x + menu.bevel_w + menu.item_h + 1; text_x = item_x + menu.bevel_w + menu.item_h + 1;
break; break;
case FFont::Right: case Misc::Font::RIGHT:
text_x = item_x + menu.item_w - (menu.item_h + menu.bevel_w + text_w); text_x = item_x + menu.item_w - (menu.item_h + menu.bevel_w + text_w);
break; break;
default: //center default: //center
@ -789,7 +789,7 @@ void Basemenu::setLabel(const char *l) {
if (menu.label) if (menu.label)
delete [] menu.label; delete [] menu.label;
if (l) menu.label = bstrdup(l); if (l) menu.label = Misc::strdup(l);
else menu.label = 0; else menu.label = 0;
} }