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

Rotate toolbar button on rotated toolbar

Browse source 
In 393ba45f91 added the possibility to
add custom buttons to the toolbar. However, if the toolbar is rotated
the buttons stays horizontal.
Update the button to rotate the text and update the width/height of the
button if rotated
This commit is contained in:
Lajos Koszti 2017-08-16 11:42:37 +02:00
parent 7cb7bfaa44
commit 6e8bf37cc8
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/ButtonTool.cc
View file

@ -51,8 +51,15 @@ void ButtonTool::updateSizing() {
btn.setBorderWidth(bw);
if (FbTk::TextButton *txtBtn = dynamic_cast<FbTk::TextButton*>(&btn)) {
bw += 2; // extra padding, seems somehow required...
resize(theme()->font().textWidth(txtBtn->text()) + 2*bw,
theme()->font().height() + 2*bw);
unsigned int new_width = theme()->font().textWidth(txtBtn->text()) + 2*bw;
unsigned int new_height = theme()->font().height() + 2*bw;
if (orientation() == FbTk::ROT0 || orientation() == FbTk::ROT180) {
resize(new_width, new_height);
} else {
resize(new_height, new_width);
}
}
}
@ -93,3 +100,9 @@ void ButtonTool::renderTheme(int alpha) {
btn.clear();
}
void ButtonTool::setOrientation(FbTk::Orientation orient) {
FbTk::Button &btn = static_cast<FbTk::Button &>(window());
btn.setOrientation(orient);
ToolbarItem::setOrientation(orient);
}

1
src/ButtonTool.hh
View file

@ -39,6 +39,7 @@ public:
FbTk::ThemeProxy<ButtonTheme> &theme,
FbTk::ImageControl &img_ctrl);
virtual ~ButtonTool();
void setOrientation(FbTk::Orientation orient);
protected:
void renderTheme(int alpha);