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

make the styles' doJustify methods stop returning the string length as this is no longer needed with the BFont class

Browse source
This commit is contained in:
Dana Jansens 2002-07-04 21:33:27 +00:00
parent de868d58dd
commit be2f47223c
4 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Basemenu.cc
View file

@ -442,7 +442,7 @@ void Basemenu::move(int x, int y) {
void Basemenu::redrawTitle(void) { void Basemenu::redrawTitle(void) {
const char *text = (! menu.label.empty()) ? getLabel() : const char *text = (! menu.label.empty()) ? getLabel() :
i18n(BasemenuSet, BasemenuBlackboxMenu, "Blackbox Menu"); i18n(BasemenuSet, BasemenuBlackboxMenu, "Blackbox Menu");
int dx = menu.bevel_w, len = strlen(text); int dx = menu.bevel_w;
unsigned int l; unsigned int l;
MenuStyle *style = screen->getMenuStyle(); MenuStyle *style = screen->getMenuStyle();
@ -544,7 +544,7 @@ void Basemenu::drawItem(int index, bool highlight, bool clear,
int sbl = index / menu.persub, i = index - (sbl * menu.persub); int sbl = index / menu.persub, i = index - (sbl * menu.persub);
int item_x = (sbl * menu.item_w), item_y = (i * menu.item_h); int item_x = (sbl * menu.item_w), item_y = (i * menu.item_h);
int hilite_x = item_x, hilite_y = item_y, hoff_x = 0, hoff_y = 0; int hilite_x = item_x, hilite_y = item_y, hoff_x = 0, hoff_y = 0;
int text_x = 0, text_y = 0, len = strlen(text), sel_x = 0, sel_y = 0; int text_x = 0, text_y = 0, sel_x = 0, sel_y = 0;
unsigned int hilite_w = menu.item_w, hilite_h = menu.item_h, text_w = 0, unsigned int hilite_w = menu.item_w, hilite_h = menu.item_h, text_w = 0,
text_h = 0; text_h = 0;
unsigned int half_w = menu.item_h / 2, quarter_w = menu.item_h / 4; unsigned int half_w = menu.item_h / 2, quarter_w = menu.item_h / 4;

8
src/Screen.hh
View file

@ -71,8 +71,8 @@ struct WindowStyle {
TextJustify justify; TextJustify justify;
int doJustify(const std::string &text, int &start_pos, void doJustify(const std::string &text, int &start_pos,
unsigned int max_length, unsigned int modifier) const; unsigned int max_length, unsigned int modifier) const;
}; };
struct ToolbarStyle { struct ToolbarStyle {
@ -83,8 +83,8 @@ struct ToolbarStyle {
TextJustify justify; TextJustify justify;
int doJustify(const std::string &text, int &start_pos, void doJustify(const std::string &text, int &start_pos,
unsigned int max_length, unsigned int modifier) const; unsigned int max_length, unsigned int modifier) const;
}; };
struct MenuStyle { struct MenuStyle {

8
src/Toolbar.cc
View file

@ -1172,9 +1172,9 @@ void Toolbarmenu::Placementmenu::itemSelected(int button, unsigned int index) {
} }
int ToolbarStyle::doJustify(const std::string &text, int &start_pos, void ToolbarStyle::doJustify(const std::string &text, int &start_pos,
unsigned int max_length, unsigned int max_length,
unsigned int modifier) const { unsigned int modifier) const {
size_t text_len = text.size(); size_t text_len = text.size();
unsigned int length; unsigned int length;
@ -1195,6 +1195,4 @@ int ToolbarStyle::doJustify(const std::string &text, int &start_pos,
default: default:
break; break;
} }
return text_len;
} }

8
src/Window.cc
View file

@ -3542,9 +3542,9 @@ void BlackboxWindow::constrain(Corner anchor, int *pw, int *ph) {
} }
int WindowStyle::doJustify(const std::string &text, int &start_pos, void WindowStyle::doJustify(const std::string &text, int &start_pos,
unsigned int max_length, unsigned int max_length,
unsigned int modifier) const { unsigned int modifier) const {
size_t text_len = text.size(); size_t text_len = text.size();
unsigned int length; unsigned int length;
@ -3565,8 +3565,6 @@ int WindowStyle::doJustify(const std::string &text, int &start_pos,
default: default:
break; break;
} }
return text_len;
} }