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

Rotate items in toolbar the same way as tabs

Browse source
This commit is contained in:
markt 2006-12-18 18:41:31 +00:00
parent 2ff67d09a7
commit 83b9e39293
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
(Format: Year/Month/Day) (Format: Year/Month/Day)
Changes for 1.0rc3: Changes for 1.0rc3:
*06/12/18:
* Rotate items in toolbar the same way as tabs (Mark)
Toolbar.cc
*06/12/17: *06/12/17:
* Stop cycling focus when any other command is run, e.g. bug #1595336 (Mark) * Stop cycling focus when any other command is run, e.g. bug #1595336 (Mark)
fluxbox.cc WorkspaceCmd.cc fluxbox.cc WorkspaceCmd.cc

16
src/Toolbar.cc
View file

@ -721,7 +721,7 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
m_shape->setPlaces(Shape::TOPRIGHT | Shape::TOPLEFT); m_shape->setPlaces(Shape::TOPRIGHT | Shape::TOPLEFT);
break; break;
case LEFTCENTER: case LEFTCENTER:
orient = FbTk::ROT90; orient = FbTk::ROT270;
frame.x = head_x; frame.x = head_x;
frame.y = head_y + (head_h - frame.height)/2 - border_width; frame.y = head_y + (head_h - frame.height)/2 - border_width;
frame.x_hidden = frame.x - frame.width + bevel_width + border_width; frame.x_hidden = frame.x - frame.width + bevel_width + border_width;
@ -730,7 +730,7 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
m_shape->setPlaces(Shape::TOPRIGHT | Shape::BOTTOMRIGHT); m_shape->setPlaces(Shape::TOPRIGHT | Shape::BOTTOMRIGHT);
break; break;
case LEFTTOP: case LEFTTOP:
orient = FbTk::ROT90; orient = FbTk::ROT270;
frame.x = head_x; frame.x = head_x;
frame.y = head_y; frame.y = head_y;
frame.x_hidden = frame.x - frame.width + bevel_width + border_width; frame.x_hidden = frame.x - frame.width + bevel_width + border_width;
@ -739,7 +739,7 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
m_shape->setPlaces(Shape::TOPRIGHT | Shape::BOTTOMRIGHT); m_shape->setPlaces(Shape::TOPRIGHT | Shape::BOTTOMRIGHT);
break; break;
case LEFTBOTTOM: case LEFTBOTTOM:
orient = FbTk::ROT90; orient = FbTk::ROT270;
frame.x = head_x; frame.x = head_x;
frame.y = head_y + head_h - frame.height - border_width*2; frame.y = head_y + head_h - frame.height - border_width*2;
frame.x_hidden = frame.x - frame.width + bevel_width + border_width; frame.x_hidden = frame.x - frame.width + bevel_width + border_width;
@ -748,7 +748,7 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
m_shape->setPlaces(Shape::TOPRIGHT | Shape::BOTTOMRIGHT); m_shape->setPlaces(Shape::TOPRIGHT | Shape::BOTTOMRIGHT);
break; break;
case RIGHTCENTER: case RIGHTCENTER:
orient = FbTk::ROT270; orient = FbTk::ROT90;
frame.x = head_x + head_w - frame.width - border_width*2; frame.x = head_x + head_w - frame.width - border_width*2;
frame.y = head_y + (head_h - frame.height)/2 - border_width; frame.y = head_y + (head_h - frame.height)/2 - border_width;
frame.x_hidden = frame.x + frame.width - bevel_width - border_width; frame.x_hidden = frame.x + frame.width - bevel_width - border_width;
@ -757,7 +757,7 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
m_shape->setPlaces(Shape::TOPLEFT | Shape::BOTTOMLEFT); m_shape->setPlaces(Shape::TOPLEFT | Shape::BOTTOMLEFT);
break; break;
case RIGHTTOP: case RIGHTTOP:
orient = FbTk::ROT270; orient = FbTk::ROT90;
frame.x = head_x + head_w - frame.width - border_width*2; frame.x = head_x + head_w - frame.width - border_width*2;
frame.y = head_y; frame.y = head_y;
frame.x_hidden = frame.x + frame.width - bevel_width - border_width; frame.x_hidden = frame.x + frame.width - bevel_width - border_width;
@ -766,7 +766,7 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
m_shape->setPlaces(Shape::TOPLEFT | Shape::BOTTOMLEFT); m_shape->setPlaces(Shape::TOPLEFT | Shape::BOTTOMLEFT);
break; break;
case RIGHTBOTTOM: case RIGHTBOTTOM:
orient = FbTk::ROT270; orient = FbTk::ROT90;
frame.x = head_x + head_w - frame.width - border_width*2; frame.x = head_x + head_w - frame.width - border_width*2;
frame.y = head_y + head_h - frame.height - border_width*2; frame.y = head_y + head_h - frame.height - border_width*2;
frame.x_hidden = frame.x + frame.width - bevel_width - border_width; frame.x_hidden = frame.x + frame.width - bevel_width - border_width;
@ -953,12 +953,12 @@ void Toolbar::rearrangeItems() {
case LEFTTOP: case LEFTTOP:
case LEFTCENTER: case LEFTCENTER:
case LEFTBOTTOM: case LEFTBOTTOM:
orient = FbTk::ROT90; orient = FbTk::ROT270;
break; break;
case RIGHTTOP: case RIGHTTOP:
case RIGHTCENTER: case RIGHTCENTER:
case RIGHTBOTTOM: case RIGHTBOTTOM:
orient = FbTk::ROT270; orient = FbTk::ROT90;
break; break;
default: default:
orient = FbTk::ROT0; orient = FbTk::ROT0;